Преглед на файлове

Merge pull request #218 from Azaezel/alpha40_vertcolorCorrect

adress #16 - don't need to swizzle vert colors (on GL)
Brian Roberts преди 5 години
родител
ревизия
0364769f9a
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
  2. 1 1
      Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp

+ 1 - 1
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp

@@ -1242,7 +1242,7 @@ void DiffuseVertColorFeatureGLSL::processVert(  Vector< ShaderComponent* >& comp
       outColor->setStructName( "OUT" );
       outColor->setType( "vec4" );
 
-      output = new GenOp( "   @ = @.bgra;\r\n", outColor, inColor );
+      output = new GenOp( "   @ = @;\r\n", outColor, inColor );
    }
    else
       output = NULL; // Nothing we need to do.

+ 1 - 1
Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp

@@ -1252,7 +1252,7 @@ void DiffuseVertColorFeatureHLSL::processVert(  Vector< ShaderComponent* >& comp
       outColor->setStructName( "OUT" );
       outColor->setType( "float4" );
 
-      output = new GenOp( "   @ = @;\r\n", outColor, inColor );
+      output = new GenOp( "   @ = @.bgra;\r\n", outColor, inColor );
    }
    else
       output = NULL; // Nothing we need to do.