Merge pull request #170 from tangziwen/v3

super626 · super626 · commit 71077e6f65b2 · 2014-12-04T09:51:22.000+08:00
avoid the case that "hasAmbient" use before assign
diff --git a/cocos/renderer/CCMeshCommand.cpp b/cocos/renderer/CCMeshCommand.cpp
@@ -460,7 +460,7 @@ void MeshCommand::setLightUniforms()
     else // normal does not exist
     {
         Vec3 ambient(0.0f, 0.0f, 0.0f);
-        bool hasAmbient;
+        bool hasAmbient = false;
         for (const auto& light : lights)
         {
             if (light->getLightType() == LightType::AMBIENT)

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ void MeshCommand::setLightUniforms()`
`460`	`460`	`else // normal does not exist`
`461`	`461`	`{`
`462`	`462`	`Vec3 ambient(0.0f, 0.0f, 0.0f);`
`463`		`- bool hasAmbient;`
	`463`	`+ bool hasAmbient = false;`
`464`	`464`	`for (const auto& light : lights)`
`465`	`465`	`{`
`466`	`466`	`if (light->getLightType() == LightType::AMBIENT)`