Commit 7d31e869 authored by bitplane's avatar bitplane

ReadOnlyMaterials in animated mesh node now works (reported by buffer)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2611 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 59100938
...@@ -303,7 +303,7 @@ void CAnimatedMeshSceneNode::render() ...@@ -303,7 +303,7 @@ void CAnimatedMeshSceneNode::render()
for (u32 i=0; i<m->getMeshBufferCount(); ++i) for (u32 i=0; i<m->getMeshBufferCount(); ++i)
{ {
scene::IMeshBuffer* mb = m->getMeshBuffer(i); scene::IMeshBuffer* mb = m->getMeshBuffer(i);
mat = Materials[i]; mat = ReadOnlyMaterials ? mb->getMaterial() : Materials[i];
mat.MaterialType = video::EMT_TRANSPARENT_ADD_COLOR; mat.MaterialType = video::EMT_TRANSPARENT_ADD_COLOR;
if (RenderFromIdentity) if (RenderFromIdentity)
driver->setTransform(video::ETS_WORLD, core::IdentityMatrix ); driver->setTransform(video::ETS_WORLD, core::IdentityMatrix );
...@@ -330,13 +330,13 @@ void CAnimatedMeshSceneNode::render() ...@@ -330,13 +330,13 @@ void CAnimatedMeshSceneNode::render()
if (transparent == isTransparentPass) if (transparent == isTransparentPass)
{ {
scene::IMeshBuffer* mb = m->getMeshBuffer(i); scene::IMeshBuffer* mb = m->getMeshBuffer(i);
const video::SMaterial& material = ReadOnlyMaterials ? mb->getMaterial() : Materials[i];
if (RenderFromIdentity) if (RenderFromIdentity)
driver->setTransform(video::ETS_WORLD, core::IdentityMatrix ); driver->setTransform(video::ETS_WORLD, core::IdentityMatrix );
else if (Mesh->getMeshType() == EAMT_SKINNED) else if (Mesh->getMeshType() == EAMT_SKINNED)
driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer*)mb)->Transformation); driver->setTransform(video::ETS_WORLD, AbsoluteTransformation * ((SSkinMeshBuffer*)mb)->Transformation);
driver->setMaterial(Materials[i]); driver->setMaterial(material);
driver->drawMeshBuffer(mb); driver->drawMeshBuffer(mb);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment