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

Update EditorGui.ed.tscript

Browse source 
clean teardown around editorPluginSet not sure why this is failing at the foreach but editorPluginSet doesnt seem to exist during the teardown of everything and foreach causes a null reference to be fired off.
This commit is contained in:
marauder2k7 2025-05-12 11:56:26 +01:00
parent b54ed77f7a
commit 0f819a3af4
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
View file

@ -317,8 +317,11 @@ function EditorGui::shutdown( %this )
%this.setEditor( "" ); %this.setEditor( "" );
// Call the shutdown callback on the editor plugins. // Call the shutdown callback on the editor plugins.
foreach( %plugin in EditorPluginSet ) for ( %i = 0; %i < EditorPluginSet.getCount(); %i++ )
%plugin.onWorldEditorShutdown(); {
%obj = EditorPluginSet.getObject(%i);
%obj.onWorldEditorShutdown();
}
} }
/// This is used to add an editor to the Editors menu which /// This is used to add an editor to the Editors menu which
@ -575,9 +578,11 @@ function EditorGui::onWake( %this )
EHWorldEditor.setStateOn( 1 ); EHWorldEditor.setStateOn( 1 );
// Notify the editor plugins that the editor has started. // Notify the editor plugins that the editor has started.
for ( %i = 0; %i < EditorPluginSet.getCount(); %i++ )
foreach( %plugin in EditorPluginSet ) {
%plugin.onEditorWake(); %obj = EditorPluginSet.getObject( %i );
%obj.onEditorWake();
}
// Push the ActionMaps in the order that we want to have them // Push the ActionMaps in the order that we want to have them
// before activating an editor plugin, so that if the plugin // before activating an editor plugin, so that if the plugin
@ -616,9 +621,11 @@ function EditorGui::onSleep( %this )
MoveMap.pop(); MoveMap.pop();
// Notify the editor plugins that the editor will be closing. // Notify the editor plugins that the editor will be closing.
for ( %i = 0; %i < EditorPluginSet.getCount(); %i++ )
foreach( %plugin in EditorPluginSet ) {
%plugin.onEditorSleep(); %obj = EditorPluginSet.getObject(%i);
%obj.onEditorSleep();
}
if(isObject($Server::CurrentScene)) if(isObject($Server::CurrentScene))
$Server::CurrentScene.open(); $Server::CurrentScene.open();
@ -715,8 +722,12 @@ function EditorGui::onNewLevelLoaded( %this, %levelName )
function EditorMissionCleanup::onRemove( %this ) function EditorMissionCleanup::onRemove( %this )
{ {
EditorGui.levelName = ""; EditorGui.levelName = "";
foreach( %plugin in EditorPluginSet )
%plugin.onExitMission(); for ( %i = 0; %i < EditorPluginSet.getCount(); %i++ )
{
%obj = EditorPluginSet.getObject(%i);
%obj.onExitMission();
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------