diff --git a/Engine/source/console/codeBlock.h b/Engine/source/console/codeBlock.h index a3c1015e9..57370f683 100644 --- a/Engine/source/console/codeBlock.h +++ b/Engine/source/console/codeBlock.h @@ -23,6 +23,7 @@ #ifndef _CODEBLOCK_H_ #define _CODEBLOCK_H_ +#include #include struct CompilerLocalVariableToRegisterMappingTable diff --git a/Engine/source/gui/editor/inspector/field.cpp b/Engine/source/gui/editor/inspector/field.cpp index 617287e68..6ee578512 100644 --- a/Engine/source/gui/editor/inspector/field.cpp +++ b/Engine/source/gui/editor/inspector/field.cpp @@ -318,7 +318,8 @@ void GuiInspectorField::setData( const char* data, bool callbacks ) { char buffer[ 2048 ]; expandEscape( buffer, newValue ); - newValue = (const char*)Con::evaluatef( "%%f = \"%s\"; return ( %s );", oldValue.c_str(), buffer ); + newValue = (const char*)Con::evaluatef( "$f = \"%s\"; return ( %s );", oldValue.c_str(), buffer ); + Con::evaluatef("$f=0;"); } else if( type == TypeS32Vector || type == TypeF32Vector @@ -353,9 +354,10 @@ void GuiInspectorField::setData( const char* data, bool callbacks ) char buffer[ 2048 ]; expandEscape( buffer, newComponentExpr ); - const char* newComponentVal = Con::evaluatef( "%%f = \"%s\"; %%v = \"%s\"; return ( %s );", + const char* newComponentVal = Con::evaluatef( "$f = \"%s\"; $v = \"%s\"; return ( %s );", oldComponentVal, oldValue.c_str(), buffer ); - + Con::evaluatef("$f=0;$v=0;"); + if( !isFirst ) strNew.append( ' ' ); strNew.append( newComponentVal );