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

Merge pull request #14194 from super626/v3 

check light enable or not when switching shader
This commit is contained in:
pandamicro 2015-10-20 17:09:37 +08:00
parent f40f3bf5a9 a4d67867d7
commit 7466c4c71e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/3d/CCSprite3D.cpp
View File

@ -730,7 +730,7 @@ void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
const auto lights = scene->getLights(); const auto lights = scene->getLights();
bool usingLight = false; bool usingLight = false;
for (const auto light : lights) { for (const auto light : lights) {
usingLight = ((unsigned int)light->getLightFlag() & _lightMask) > 0; usingLight = (light->isEnabled() && (unsigned int)light->getLightFlag() & _lightMask) > 0;
if (usingLight) if (usingLight)
break; break;
} }