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

Merge branch 'Preview4_0_DevHead' into tsneo

Browse source 
# Conflicts:
#	Engine/source/console/consoleInternal.cpp
This commit is contained in:
Jeff Hutchinson 2021-06-18 21:13:49 -04:00
commit acde0c3f0b
17 changed files with 96 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/consoleInternal.cpp
View file

@ -1401,7 +1401,7 @@ ConsoleValue Namespace::Entry::execute(S32 argc, ConsoleValue *argv, ExprEvalSta
result.setInt(cb.mIntCallbackFunc(state->thisObject, argc, argv));
break;
case FloatCallbackType:
result.setFloat(cb.mBoolCallbackFunc(state->thisObject, argc, argv));
result.setFloat(cb.mFloatCallbackFunc(state->thisObject, argc, argv));
break;
case VoidCallbackType:
cb.mVoidCallbackFunc(state->thisObject, argc, argv);