From 9d84372dc8902ae9d971f0cc9b5ce7a6616e60cc Mon Sep 17 00:00:00 2001 From: Anis Date: Mon, 19 Jan 2015 20:56:02 +0100 Subject: [PATCH] Intel OpenGL - fix a crash/shader compile error when you activate Vertex Lit from Material Editor --- Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp index 7c54cced8..8767b0b2d 100644 --- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp +++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp @@ -1425,6 +1425,13 @@ void VertLitGLSL::processVert( Vector &componentList, Var* outColor = dynamic_cast< Var* >( LangElement::find( "vertColor" ) ); if( !outColor ) { + // Grab the connector color + ShaderConnector *connectComp = dynamic_cast( componentList[C_CONNECTOR] ); + Var *outColor = connectComp->getElement( RT_COLOR ); + outColor->setName( "vertColor" ); + outColor->setStructName( "OUT" ); + outColor->setType( "vec4" ); + // Search for vert color Var *inColor = (Var*) LangElement::find( "diffuse" ); @@ -1435,13 +1442,6 @@ void VertLitGLSL::processVert( Vector &componentList, return; } - // Grab the connector color - ShaderConnector *connectComp = dynamic_cast( 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 ); } else