mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-09 08:38:43 +08:00
Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6
This commit is contained in:
commit
db7166590e
@ -61,7 +61,7 @@ public:
|
||||
return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlas, scale);
|
||||
}
|
||||
// Use createWithJsonFile instead
|
||||
CC_DEPRECATED_ATTRIBUTE static SkeletonAnimation* createWithile (const std::string& skeletonJsonFile, const std::string& atlasFile, float scale = 1)
|
||||
CC_DEPRECATED_ATTRIBUTE static SkeletonAnimation* createWithFile (const std::string& skeletonJsonFile, const std::string& atlasFile, float scale = 1)
|
||||
{
|
||||
return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlasFile, scale);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user