TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 05:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'jamesu/console_stack_fix2' into development

Browse source 
Conflicts:
	Engine/source/console/console.cpp
This commit is contained in:
Daniel Buckmaster 2015-03-01 20:33:29 +11:00
commit 6c92ab065e
48 changed files with 2979 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/lighting/common/sceneLighting.cpp
View file

@ -24,6 +24,7 @@
#include "lighting/common/sceneLighting.h"
#include "T3D/gameBase/gameConnection.h"
#include "console/engineAPI.h"
#include "console/consoleTypes.h"
#include "scene/sceneManager.h"
#include "lighting/common/shadowVolumeBSP.h"
@ -605,7 +606,7 @@ void SceneLighting::completed(bool success)
}
if(gCompleteCallback && gCompleteCallback[0])
Con::executef(gCompleteCallback);
Con::executef((const char*)gCompleteCallback);
dFree(gCompleteCallback);
gCompleteCallback = NULL;