From bb27535597c56a34623cee0369619341e4a379cd Mon Sep 17 00:00:00 2001 From: Areloch Date: Wed, 14 Sep 2016 01:41:49 -0500 Subject: [PATCH] Fixes the Toggle Children Lock and Toggle Children Hidden options in the editor context popup menu. --- .../tools/worldEditor/scripts/EditorGui.ed.cs | 26 ++++++++++++++++--- .../tools/worldEditor/scripts/EditorGui.ed.cs | 26 ++++++++++++++++--- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs b/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs index 6321e44aa..38a180e64 100644 --- a/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs +++ b/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs @@ -2135,10 +2135,19 @@ function EWorldEditor::toggleLockChildren( %this, %simGroup ) { foreach( %child in %simGroup ) { + if( %child.class $= "SimGroup" ) + { + %this.toggleHideChildren( %child ); + } if( %child.isMemberOfClass( "SimGroup" ) ) - %this.toggleLockChildren( %child ); - else + { + %this.toggleHideChildren( %child ); %child.setLocked( !%child.locked ); + } + else + { + %child.setLocked( !%child.locked ); + } } EWorldEditor.syncGui(); @@ -2148,10 +2157,19 @@ function EWorldEditor::toggleHideChildren( %this, %simGroup ) { foreach( %child in %simGroup ) { - if( %child.isMemberOfClass( "SimGroup" ) ) + if( %child.class $= "SimGroup" ) + { + %this.toggleHideChildren( %child ); + } + if( %child.isMemberOfClass( "SimGroup" ) ) + { %this.toggleHideChildren( %child ); - else %this.hideObject( %child, !%child.hidden ); + } + else + { + %this.hideObject( %child, !%child.hidden ); + } } EWorldEditor.syncGui(); diff --git a/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs b/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs index 6321e44aa..38a180e64 100644 --- a/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs +++ b/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs @@ -2135,10 +2135,19 @@ function EWorldEditor::toggleLockChildren( %this, %simGroup ) { foreach( %child in %simGroup ) { + if( %child.class $= "SimGroup" ) + { + %this.toggleHideChildren( %child ); + } if( %child.isMemberOfClass( "SimGroup" ) ) - %this.toggleLockChildren( %child ); - else + { + %this.toggleHideChildren( %child ); %child.setLocked( !%child.locked ); + } + else + { + %child.setLocked( !%child.locked ); + } } EWorldEditor.syncGui(); @@ -2148,10 +2157,19 @@ function EWorldEditor::toggleHideChildren( %this, %simGroup ) { foreach( %child in %simGroup ) { - if( %child.isMemberOfClass( "SimGroup" ) ) + if( %child.class $= "SimGroup" ) + { + %this.toggleHideChildren( %child ); + } + if( %child.isMemberOfClass( "SimGroup" ) ) + { %this.toggleHideChildren( %child ); - else %this.hideObject( %child, !%child.hidden ); + } + else + { + %this.hideObject( %child, !%child.hidden ); + } } EWorldEditor.syncGui();