UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 3.9-beta

Browse Source
This commit is contained in:
badlogic 2019-11-19 16:36:36 +01:00
commit c90ca1b08c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-cocos2dx/src/spine/SkeletonRenderer.cpp
View File

@ -766,10 +766,14 @@ namespace spine {
return _skeleton->getAttachment(slotName.c_str(), attachmentName.c_str()); return _skeleton->getAttachment(slotName.c_str(), attachmentName.c_str());
} }
bool SkeletonRenderer::setAttachment (const std::string& slotName, const std::string& attachmentName) { bool SkeletonRenderer::setAttachment (const std::string& slotName, const std::string& attachmentName) {
return _skeleton->getAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()) ? true : false; bool result = _skeleton->getAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str()) ? true : false;
_skeleton->setAttachment(slotName.c_str(), attachmentName.empty() ? 0 : attachmentName.c_str());
return result;
} }
bool SkeletonRenderer::setAttachment (const std::string& slotName, const char* attachmentName) { bool SkeletonRenderer::setAttachment (const std::string& slotName, const char* attachmentName) {
return _skeleton->getAttachment(slotName.c_str(), attachmentName) ? true : false; bool result = _skeleton->getAttachment(slotName.c_str(), attachmentName) ? true : false;
_skeleton->setAttachment(slotName.c_str(), attachmentName);
return result;
} }
void SkeletonRenderer::setTwoColorTint(bool enabled) { void SkeletonRenderer::setTwoColorTint(bool enabled) {

7
spine-cpp/spine-cpp/src/spine/Skeleton.cpp
View File

@ -303,10 +303,7 @@ int Skeleton::findSlotIndex(const String &slotName) {
} }
void Skeleton::setSkin(const String &skinName) { void Skeleton::setSkin(const String &skinName) {
Skin *foundSkin = _data->findSkin(skinName); Skin *foundSkin = skinName.isEmpty() ? NULL : _data->findSkin(skinName);
assert(foundSkin != NULL);
setSkin(foundSkin); setSkin(foundSkin);
} }
@ -340,7 +337,7 @@ Attachment *Skeleton::getAttachment(const String &slotName, const String &attach
} }
Attachment *Skeleton::getAttachment(int slotIndex, const String &attachmentName) { Attachment *Skeleton::getAttachment(int slotIndex, const String &attachmentName) {
assert(attachmentName.length() > 0); if (attachmentName.isEmpty()) return NULL;
if (_skin != NULL) { if (_skin != NULL) {
Attachment *attachment = _skin->getAttachment(slotIndex, attachmentName); Attachment *attachment = _skin->getAttachment(slotIndex, attachmentName);