Commit 1cb3b8ee authored by cutealien's avatar cutealien

Identical expression was checked twice (found by cppcheck).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4978 dfc29bdd-3216-0410-991c-e03cc46cb475
parent a833c4e0
...@@ -262,7 +262,6 @@ E_SCENE_NODE_RENDER_PASS CQuake3ShaderSceneNode::getRenderStage() const ...@@ -262,7 +262,6 @@ E_SCENE_NODE_RENDER_PASS CQuake3ShaderSceneNode::getRenderStage() const
else else
if ( strstr ( Shader->name.c_str(), "flame" ) || if ( strstr ( Shader->name.c_str(), "flame" ) ||
group->isDefined( "surfaceparm", "water" ) || group->isDefined( "surfaceparm", "water" ) ||
group->isDefined( "sort", "underwater" ) ||
group->isDefined( "sort", "underwater" ) group->isDefined( "sort", "underwater" )
) )
{ {
...@@ -735,7 +734,7 @@ void CQuake3ShaderSceneNode::deformvertexes_bulge( f32 dt, SModifierFunction &fu ...@@ -735,7 +734,7 @@ void CQuake3ShaderSceneNode::deformvertexes_bulge( f32 dt, SModifierFunction &fu
function.count = 1; function.count = 1;
} }
/*! /*!
deformVertexes autosprite deformVertexes autosprite
...@@ -859,7 +858,7 @@ void CQuake3ShaderSceneNode::vertextransform_rgbgen( f32 dt, SModifierFunction & ...@@ -859,7 +858,7 @@ void CQuake3ShaderSceneNode::vertextransform_rgbgen( f32 dt, SModifierFunction &
MeshBuffer->Vertices[i].Color.set(0xFF7F7F7F); MeshBuffer->Vertices[i].Color.set(0xFF7F7F7F);
break; break;
case EXACTVERTEX: case EXACTVERTEX:
// alphagen exactvertex TODO lighting // alphagen exactvertex TODO lighting
case VERTEX: case VERTEX:
// rgbgen vertex // rgbgen vertex
...@@ -905,7 +904,7 @@ void CQuake3ShaderSceneNode::vertextransform_alphagen( f32 dt, SModifierFunction ...@@ -905,7 +904,7 @@ void CQuake3ShaderSceneNode::vertextransform_alphagen( f32 dt, SModifierFunction
MeshBuffer->Vertices[i].Color.setAlpha ( 0xFF ); MeshBuffer->Vertices[i].Color.setAlpha ( 0xFF );
break; break;
case EXACTVERTEX: case EXACTVERTEX:
// alphagen exactvertex TODO lighting // alphagen exactvertex TODO lighting
case VERTEX: case VERTEX:
// alphagen vertex // alphagen vertex
...@@ -1283,7 +1282,7 @@ void CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture ) ...@@ -1283,7 +1282,7 @@ void CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
default: default:
break; break;
} }
} break; } break;
case TEXTURE: case TEXTURE:
case LIGHTMAP: case LIGHTMAP:
...@@ -1366,7 +1365,7 @@ video::SMaterial& CQuake3ShaderSceneNode::getMaterial(u32 i) ...@@ -1366,7 +1365,7 @@ video::SMaterial& CQuake3ShaderSceneNode::getMaterial(u32 i)
if ( Q3Texture [ i ].TextureIndex ) if ( Q3Texture [ i ].TextureIndex )
m.setTexture(0, Q3Texture [ i ].Texture [ Q3Texture [ i ].TextureIndex ]); m.setTexture(0, Q3Texture [ i ].Texture [ Q3Texture [ i ].TextureIndex ]);
return m; return m;
} }
} // end namespace scene } // end namespace scene
......
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