TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-20 03:45:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
This commit is contained in:
Azaezel 2018-03-28 15:42:34 -05:00
commit 28e509af1a
158 changed files with 2954 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/shaderGen/HLSL/shaderCompHLSL.cpp
View file

@ -232,7 +232,7 @@ void ShaderConnectorHLSL::sortVars()
void ShaderConnectorHLSL::setName( char *newName )
{
dStrcpy( (char*)mName, newName );
dStrcpy( (char*)mName, newName, 32 );
}
void ShaderConnectorHLSL::reset()