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

Merge remote-tracking branch 'upstream/development' into STBImageLoading-PR

Browse source
This commit is contained in:
marauder2k7 2023-11-30 09:09:57 +00:00
commit 0b451aa7b5
22 changed files with 187 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -436,7 +436,7 @@ SimObject *spawnObject(String spawnClass, String spawnDataBlock, String spawnNam
// If we have a spawn script go ahead and execute it last
if (spawnScript.isNotEmpty())
Con::evaluate(spawnScript.c_str(), true);
Con::evaluate(spawnScript.c_str());
return spawnObject;
}

2
Engine/source/gui/editor/inspector/dynamicField.cpp
View file

@ -74,7 +74,7 @@ void GuiInspectorDynamicField::setData( const char* data, bool callbacks )
{
target->inspectPreApply();
if( callbacks )
if( callbacks && !mField->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors))
{
if( isRemoval )
Con::executef( mInspector, "onFieldRemoved", target->getIdString(), mDynField->slotName );

2
Engine/source/gui/editor/inspector/field.cpp
View file

@ -378,7 +378,7 @@ void GuiInspectorField::setData( const char* data, bool callbacks )
// Fire callback single-object undo.
if( callbacks )
if( callbacks && !mField->flag.test(AbstractClassRep::FieldFlags::FIELD_ComponentInspectors) )
Con::executef( mInspector, "onInspectorFieldModified",
target->getIdString(),
mField->pFieldname,