TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-24 17:13:54 +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/gui/core/guiControl.cpp
View file

@ -2570,7 +2570,7 @@ DefineEngineMethod( GuiControl, findHitControls, const char*, ( S32 x, S32 y, S3
return "";
char* buffer = Con::getReturnBuffer( s.size() );
dStrcpy( buffer, s.c_str() );
dStrcpy( buffer, s.c_str(), s.size() );
return buffer;
}