Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update code, using condition macro to determine studio or user project

This commit is contained in:
XiaoFeng 2015-08-20 13:33:48 +08:00
parent 93f026f8e6
commit 6bdb5431f1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/editor-support/cocostudio/CCBone.cpp
View File

@ -257,15 +257,17 @@ void Bone::setBlendFunc(const BlendFunc& blendFunc)
void Bone::updateDisplayedColor(const Color3B &parentColor)
{
// remove comment mark for next line when use in studio
// _realColor = Color3B(255, 255, 255);
#ifdef CC_STUDIO_ENABLED_VIEW
_realColor = Color3B(255, 255, 255);
#endif // CC_STUDIO_ENABLED_VIEW
Node::updateDisplayedColor(parentColor);
}
void Bone::updateDisplayedOpacity(GLubyte parentOpacity)
{
// remove comment mark for next line when use in studio
// _realOpacity = 255;
#ifdef CC_STUDIO_ENABLED_VIEW
_realOpacity = 255;
#endif // CC_STUDIO_ENABLED_VIEW
Node::updateDisplayedOpacity(parentOpacity);
}