Merge pull request #14574 from super626/v3

pandamicro · pandamicro · commit 6ff2586f260d · 2015-12-04T17:38:56.000+08:00
Fix Sprite3D::setMaterial when multiple meshes exist
diff --git a/cocos/3d/CCSprite3D.cpp b/cocos/3d/CCSprite3D.cpp
@@ -457,9 +457,9 @@ void Sprite3D::setMaterial(Material *material, int meshIndex)
 
     if (meshIndex == -1)
     {
-        for (auto mesh: _meshes)
+        for (size_t i = 0; i < _meshes.size(); i++)
         {
-            mesh->setMaterial(material);
+            _meshes.at(i)->setMaterial(i == 0 ? material : material->clone());
         }
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -457,9 +457,9 @@ void Sprite3D::setMaterial(Material *material, int meshIndex)`
`457`	`457`
`458`	`458`	`if (meshIndex == -1)`
`459`	`459`	`{`
`460`		`- for (auto mesh: _meshes)`
	`460`	`+ for (size_t i = 0; i < _meshes.size(); i++)`
`461`	`461`	`{`
`462`		`- mesh->setMaterial(material);`
	`462`	`+ _meshes.at(i)->setMaterial(i == 0 ? material : material->clone());`
`463`	`463`	`}`
`464`	`464`	`}`
`465`	`465`	`else`