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

Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP

Browse source 
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
This commit is contained in:
AzaezelX 2019-05-01 23:18:31 -05:00
commit 97ec99f704
235 changed files with 7064 additions and 3090 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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