TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Intel OpenGL - fix a crash/shader compile error when you activate Vertex Lit from Material Editor

Browse source
This commit is contained in:
Anis 2015-01-19 20:56:02 +01:00
parent d08db6cc54
commit 9d84372dc8
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
View file

@ -1425,6 +1425,13 @@ void VertLitGLSL::processVert( Vector<ShaderComponent*> &componentList,
Var* outColor = dynamic_cast< Var* >( LangElement::find( "vertColor" ) ); Var* outColor = dynamic_cast< Var* >( LangElement::find( "vertColor" ) );
if( !outColor ) if( !outColor )
{ {
// Grab the connector color
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
Var *outColor = connectComp->getElement( RT_COLOR );
outColor->setName( "vertColor" );
outColor->setStructName( "OUT" );
outColor->setType( "vec4" );
// Search for vert color // Search for vert color
Var *inColor = (Var*) LangElement::find( "diffuse" ); Var *inColor = (Var*) LangElement::find( "diffuse" );
@ -1435,13 +1442,6 @@ void VertLitGLSL::processVert( Vector<ShaderComponent*> &componentList,
return; return;
} }
// Grab the connector color
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
Var *outColor = connectComp->getElement( RT_COLOR );
outColor->setName( "vertColor" );
outColor->setStructName( "OUT" );
outColor->setType( "vec4" );
output = new GenOp( " @ = @;\r\n", outColor, inColor ); output = new GenOp( " @ = @;\r\n", outColor, inColor );
} }
else else