TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/style-cleanup' into development

Browse source 
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
This commit is contained in:
Daniel Buckmaster 2015-03-01 22:30:22 +11:00
commit 33fcc59543
62 changed files with 3380 additions and 3381 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/console/simObject.cpp
View file

@ -2159,8 +2159,8 @@ DefineConsoleMethod( SimObject, dumpMethods, ArrayObject*, (),,
str.append( e->getPrototypeString() );
str.append( '\n' );
if( e->mCode && e->mCode->fullPath )
str.append( e->mCode->fullPath );
if( e->mCode && e->mCode->mFullPath )
str.append( e->mCode->mFullPath );
str.append( '\n' );
if( e->mCode )
str.append( String::ToString( e->mFunctionLineNumber ) );