Browse Source

Merge pull request #1942 from Areloch/forestEditingFixes

Fixes some issues with forest editor.
Areloch 8 years ago
parent
commit
b6cbac0a08

+ 3 - 0
Engine/source/forest/editor/forestSelectionTool.cpp

@@ -197,6 +197,9 @@ void ForestSelectionTool::_selectItem( const ForestItem &item )
 
 void ForestSelectionTool::deleteSelection()
 {
+   if (!mEditor)
+      return;
+
    ForestDeleteUndoAction *action = new ForestDeleteUndoAction( mForest->getData(), mEditor );
 
    for ( U32 i=0; i < mSelection.size(); i++ )

+ 1 - 1
Templates/Empty/game/tools/forestEditor/forestEditorGui.gui

@@ -252,7 +252,7 @@
                   objectNamesOnly = "1";
                   useInspectorTooltips = "0";
                   tooltipOnWidthOnly = "0";
-                  compareToObjectID = "1";
+                  compareToObjectID = "0";
                   canRenameObjects = "1";
                   renameInternal = "0";
                   isContainer = "1";

+ 1 - 1
Templates/Full/game/tools/forestEditor/forestEditorGui.gui

@@ -252,7 +252,7 @@
                   objectNamesOnly = "1";
                   useInspectorTooltips = "0";
                   tooltipOnWidthOnly = "0";
-                  compareToObjectID = "1";
+                  compareToObjectID = "0";
                   canRenameObjects = "1";
                   renameInternal = "0";
                   isContainer = "1";