Merge pull request #303 from Areloch/MiscFixes20200826

Miscellaneous small issue fixes

Engine/source/T3D/assets/assetImporter.cpp

@@ -1285,6 +1285,10 @@ void AssetImportConfig::loadSISFile(Torque::Path filePath)
          return;
       }
    }
+   else
+   {
+      return;
+   }
 
    String headerLine = (const char*)fileObj->readLine();
    if (headerLine.substr(0, 4).compare("SISV", 0U, String::NoCase) != 0)

Templates/BaseGame/game/data/ExampleModule/scripts/ExampleGamemodeScript.cs

@@ -43,7 +43,7 @@ function ExampleGameMode::onMissionStart(%this)
 
    // Start the game timer
    if (%this.duration)
-      %this.gameSchedule = schedule(%this.duration * 1000, "onGameDurationEnd");
+      %this.gameSchedule = schedule(%this.duration * 1000, 0, "onGameDurationEnd");
       
    %this.running = true;
 }

Templates/BaseGame/game/data/ui/scripts/menuInputButtons.cs

@@ -117,8 +117,6 @@ function MenuInputButton::refresh(%this)
                %path = %path @ "Options";
             else if(%this.gamepadButton $= "btn_back")
                %path = %path @ "Share";
-            else      
-               continue;
          }
          else if($activeControllerName $= "Nintendo Switch Pro Controller")
          {
@@ -144,8 +142,6 @@ function MenuInputButton::refresh(%this)
                %path = %path @ "Plus";
             else if(%this.gamepadButton $= "btn_back")
                %path = %path @ "Minus";
-            else      
-               continue;
          }
          else if($activeControllerName !$= "")
          {
@@ -171,8 +167,6 @@ function MenuInputButton::refresh(%this)
                %path = %path @ "Menu";
             else if(%this.gamepadButton $= "btn_back")
                %path = %path @ "Windows";
-            else      
-               continue;
          }
       } 
    }

Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs

@@ -63,7 +63,7 @@ function AssetBrowser::onWake(%this)
    
    AssetBrowser-->previewSlider.setValue(EditorSettings.value("Assets/Browser/previewTileSize", "1.0"));
    
-   AssetBrowser-->filterAssetsButton.setEnabled(true); 
+   AssetBrowser-->filterAssetsButton.setActive(true); 
 }
 
 function contentTreeTabBook::onTabSelected(%this, %tabText, %tabIndex)
@@ -279,11 +279,11 @@ function AssetBrowser::showDialog( %this, %AssetTypeFilter, %selectCallback, %ta
    //visibility filter
    if(%AssetTypeFilter !$= "")
    {
-      AssetBrowser-->filterAssetsButton.setEnabled(false);
+      AssetBrowser-->filterAssetsButton.setActive(false);
    }
    else
    {
-      AssetBrowser-->filterAssetsButton.setEnabled(true);  
+      AssetBrowser-->filterAssetsButton.setActive(true);  
    }
    
    if(%selectCallback $= "")

Templates/BaseGame/game/tools/settings.xml

@@ -1,38 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <EditorSettings>
-    <Group name="RiverEditor">
-        <Setting name="DefaultNormal">0 0 1</Setting>
-        <Setting name="HoverNodeColor">255 255 255 255</Setting>
-        <Setting name="DefaultDepth">5</Setting>
-        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
-        <Setting name="HoverSplineColor">255 0 0 255</Setting>
-        <Setting name="DefaultWidth">10</Setting>
+    <Group name="AssetBrowser">
+        <Setting name="previewSize">Small</Setting>
+    </Group>
+    <Group name="AssetCreation">
+        <Setting name="AssetImporDefaultConfig">TestConfig</Setting>
+        <Setting name="AutoImport">1</Setting>
+        <Setting name="CppAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;SpecialAssetTag&gt;/</Setting>
+        <Setting name="CubemapAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
+        <Setting name="GUIAssetSubdirectoryFormat">&lt;AssetType&gt;/OtherFolder/</Setting>
+        <Setting name="LevelAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;AssetName&gt;/</Setting>
+        <Setting name="PostFXAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
+        <Setting name="ScriptAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;SpecialAssetTag&gt;/</Setting>
+        <Setting name="StatemachineAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
+        <Setting name="TerrainAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
+        <Setting name="TerrainMatAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
+    </Group>
+    <Group name="Assets">
+        <Setting name="AssetImporDefaultConfig">TestConfig</Setting>
+        <Setting name="AutoImport">1</Setting>
+        <Group name="Browser">
+            <Setting name="previewTileSize">small</Setting>
+        </Group>
+    </Group>
+    <Group name="AxisGizmo">
+        <Setting name="axisGizmoMaxScreenLen">100</Setting>
+        <Setting name="mouseRotateScalar">0.8</Setting>
+        <Setting name="mouseScaleScalar">0.8</Setting>
+        <Setting name="renderInfoText">1</Setting>
+        <Setting name="renderWhenUsed">0</Setting>
+        <Setting name="rotationSnap">15</Setting>
+        <Setting name="snapRotations">0</Setting>
+        <Group name="Grid">
+            <Setting name="forceSnapRotations">1</Setting>
+            <Setting name="gridColor">255 255 255 20</Setting>
+            <Setting name="gridSize">1 1 1</Setting>
+            <Setting name="planeDim">500</Setting>
+            <Setting name="renderPlane">0</Setting>
+            <Setting name="renderPlaneHashes">0</Setting>
+            <Setting name="snapToGrid">0</Setting>
+        </Group>
+    </Group>
+    <Group name="ConvexEditor">
+        <Setting name="materialName">Grid_512_Orange</Setting>
+    </Group>
+    <Group name="DatablockEditor">
+        <Setting name="libraryTab">1</Setting>
     </Group>
     <Group name="GuiEditor">
         <Setting name="lastPath">tools/RPGDialogEditor/gui</Setting>
         <Setting name="previewResolution">1024 768</Setting>
-        <Group name="Snapping">
-            <Setting name="snapToGuides">1</Setting>
-            <Setting name="snapToCenters">1</Setting>
-            <Setting name="snapToCanvas">1</Setting>
-            <Setting name="snapToControls">1</Setting>
-            <Setting name="sensitivity">2</Setting>
-            <Setting name="snapToEdges">1</Setting>
-            <Setting name="snap2GridSize">8</Setting>
-            <Setting name="snap2Grid">0</Setting>
-        </Group>
-        <Group name="Library">
-            <Setting name="viewType">Categorized</Setting>
-        </Group>
         <Group name="EngineDevelopment">
-            <Setting name="toggleIntoEditor">0</Setting>
             <Setting name="showEditorGuis">0</Setting>
             <Setting name="showEditorProfiles">0</Setting>
+            <Setting name="toggleIntoEditor">0</Setting>
         </Group>
         <Group name="Help">
             <Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
-            <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
             <Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
+            <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
+        </Group>
+        <Group name="Library">
+            <Setting name="viewType">Categorized</Setting>
         </Group>
         <Group name="Rendering">
             <Setting name="drawBorderLines">1</Setting>
@@ -41,225 +70,199 @@
         <Group name="Selection">
             <Setting name="fullBox">0</Setting>
         </Group>
-    </Group>
-    <Group name="WorldEditor">
-        <Setting name="lastEditedLevel">FPSGameplay:EmptyLevel</Setting>
-        <Setting name="startupMode">Blank Level</Setting>
-        <Setting name="forceLoadDAE">0</Setting>
-        <Setting name="torsionPath">AssetWork_Debug.exe</Setting>
-        <Setting name="recentLevelsList">FPSGameplay:EmptyLevel,pbr:PbrMatTestLevel,FPSGameplay:EmptyTerrain,TTR:DasBootLevel</Setting>
-        <Setting name="orthoFOV">50</Setting>
-        <Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
-        <Setting name="EditorLayoutMode">Modern</Setting>
-        <Setting name="undoLimit">40</Setting>
-        <Setting name="dropType">screenCenter</Setting>
-        <Setting name="displayType">6</Setting>
-        <Setting name="forceSidebarToSide">1</Setting>
-        <Setting name="orthoShowGrid">1</Setting>
-        <Group name="Theme">
-            <Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
-            <Setting name="windowTitleFontColor">215 215 215 255</Setting>
-            <Setting name="windowTitleBGColor">50 50 50 255</Setting>
-            <Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
-            <Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
-        </Group>
-        <Group name="Tools">
-            <Setting name="dropAtScreenCenterMax">100</Setting>
-            <Setting name="snapSoft">0</Setting>
-            <Setting name="OffsetZValue">0.01</Setting>
-            <Setting name="dropAtScreenCenterScalar">1</Setting>
-            <Setting name="TerrainSnapOffsetZ">0</Setting>
-            <Setting name="snapGround">0</Setting>
-            <Setting name="objectsUseBoxCenter">1</Setting>
-            <Setting name="snapSoftSize">2</Setting>
-            <Setting name="boundingBoxCollision">0</Setting>
-        </Group>
-        <Group name="Render">
-            <Setting name="renderSelectionBox">1</Setting>
-            <Setting name="renderObjHandle">1</Setting>
-            <Setting name="showMousePopupInfo">1</Setting>
-            <Setting name="renderObjText">1</Setting>
-            <Setting name="renderPopupBackground">1</Setting>
-        </Group>
-        <Group name="Images">
-            <Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
-            <Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
-            <Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
-        </Group>
-        <Group name="ObjectIcons">
-            <Setting name="fadeIcons">1</Setting>
-            <Setting name="fadeIconsStartDist">8</Setting>
-            <Setting name="fadeIconsEndDist">20</Setting>
-            <Setting name="fadeIconsEndAlpha">0</Setting>
-            <Setting name="fadeIconsStartAlpha">255</Setting>
-        </Group>
-        <Group name="Color">
-            <Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
-            <Setting name="selectionBoxColor">255 255 0 255</Setting>
-            <Setting name="popupBackgroundColor">100 100 100 255</Setting>
-            <Setting name="objMouseOverColor">0 255 0 255</Setting>
-            <Setting name="dragRectColor">255 255 0 255</Setting>
-            <Setting name="objectTextColor">255 255 255 255</Setting>
-            <Setting name="objSelectColor">255 0 0 255</Setting>
-        </Group>
-        <Group name="Grid">
-            <Setting name="gridColor">102 102 102 100</Setting>
-            <Setting name="gridSize">1</Setting>
-            <Setting name="gridMinorColor">51 51 51 100</Setting>
-            <Setting name="gridOriginColor">255 255 255 100</Setting>
-            <Setting name="gridSnap">1</Setting>
-        </Group>
-        <Group name="Docs">
-            <Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
-            <Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
-            <Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
-            <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
-        </Group>
-        <Group name="Layout">
-            <Setting name="LayoutMode">Classic</Setting>
-        </Group>
-    </Group>
-    <Group name="ShapeEditor">
-        <Setting name="renderMounts">1</Setting>
-        <Setting name="SunDiffuseColor">255 255 255 255</Setting>
-        <Setting name="SunAngleX">45</Setting>
-        <Setting name="RenderCollision">0</Setting>
-        <Setting name="backgroundColor">0 0 0 100</Setting>
-        <Setting name="highlightMaterial">1</Setting>
-        <Setting name="AdvancedWndVisible">1</Setting>
-        <Setting name="showBounds">0</Setting>
-        <Setting name="SunAngleZ">135</Setting>
-        <Setting name="showObjBox">1</Setting>
-        <Setting name="gridSize">0.1</Setting>
-        <Setting name="showNodes">1</Setting>
-        <Setting name="SunAmbientColor">180 180 180 255</Setting>
-        <Setting name="gridDimension">40 40</Setting>
-        <Setting name="ShowGrid">1</Setting>
-    </Group>
-    <Group name="AxisGizmo">
-        <Setting name="mouseScaleScalar">0.8</Setting>
-        <Setting name="mouseRotateScalar">0.8</Setting>
-        <Setting name="renderWhenUsed">0</Setting>
-        <Setting name="axisGizmoMaxScreenLen">100</Setting>
-        <Setting name="renderInfoText">1</Setting>
-        <Setting name="rotationSnap">15</Setting>
-        <Setting name="snapRotations">0</Setting>
-        <Group name="Grid">
-            <Setting name="planeDim">500</Setting>
-            <Setting name="forceSnapRotations">1</Setting>
-            <Setting name="renderPlaneHashes">0</Setting>
-            <Setting name="gridSize">1 1 1</Setting>
-            <Setting name="gridColor">255 255 255 20</Setting>
-            <Setting name="renderPlane">0</Setting>
-            <Setting name="snapToGrid">1</Setting>
-        </Group>
-    </Group>
-    <Group name="AssetBrowser">
-        <Setting name="previewSize">Small</Setting>
-    </Group>
-    <Group name="MeshRoadEditor">
-        <Setting name="DefaultNormal">0 0 1</Setting>
-        <Setting name="DefaultWidth">10</Setting>
-        <Setting name="HoverSplineColor">255 0 0 255</Setting>
-        <Setting name="sideMaterialName">DefaultRoadMaterialOther</Setting>
-        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
-        <Setting name="topMaterialName">DefaultRoadMaterialTop</Setting>
-    </Group>
-    <Group name="TerrainEditor">
-        <Setting name="currentAction">lowerHeight</Setting>
-        <Group name="Brush">
-            <Setting name="brushPressure">1</Setting>
-            <Setting name="brushType">ellipse</Setting>
-            <Setting name="brushSoftness">1</Setting>
-            <Setting name="brushSize">40 40</Setting>
-            <Setting name="maxBrushSize">40 40</Setting>
-        </Group>
-        <Group name="ActionValues">
-            <Setting name="SlopeMinAngle">0</Setting>
-            <Setting name="setHeightVal">100</Setting>
-            <Setting name="softSelectDefaultFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
-            <Setting name="noiseFactor">1</Setting>
-            <Setting name="SlopeMaxAngle">90</Setting>
-            <Setting name="softSelectRadius">50</Setting>
-            <Setting name="adjustHeightVal">10</Setting>
-            <Setting name="softSelectFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
-            <Setting name="scaleVal">1</Setting>
-            <Setting name="smoothFactor">0.1</Setting>
+        <Group name="Snapping">
+            <Setting name="sensitivity">2</Setting>
+            <Setting name="snap2Grid">0</Setting>
+            <Setting name="snap2GridSize">8</Setting>
+            <Setting name="snapToCanvas">1</Setting>
+            <Setting name="snapToCenters">1</Setting>
+            <Setting name="snapToControls">1</Setting>
+            <Setting name="snapToEdges">1</Setting>
+            <Setting name="snapToGuides">1</Setting>
         </Group>
     </Group>
-    <Group name="AssetCreation">
-        <Setting name="CubemapAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
-        <Setting name="StatemachineAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
-        <Setting name="AutoImport">1</Setting>
-        <Setting name="AssetImporDefaultConfig">TestConfig</Setting>
-        <Setting name="LevelAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;AssetName&gt;/</Setting>
-        <Setting name="CppAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;SpecialAssetTag&gt;/</Setting>
-        <Setting name="PostFXAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
-        <Setting name="ScriptAssetSubdirectoryFormat">&lt;AssetType&gt;/&lt;SpecialAssetTag&gt;/</Setting>
-        <Setting name="TerrainAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
-        <Setting name="GUIAssetSubdirectoryFormat">&lt;AssetType&gt;/OtherFolder/</Setting>
-        <Setting name="TerrainMatAssetSubdirectoryFormat">&lt;AssetType&gt;/</Setting>
-    </Group>
     <Group name="LevelInformation">
         <Setting name="levelsDirectory">data/FPSGameplay/levels</Setting>
         <Group name="levels">
-            <Group name="PbrMatTest.mis">
-                <Setting name="cameraSpeed">5</Setting>
-            </Group>
             <Group name="BlankRoom.mis">
                 <Setting name="cameraSpeed">25</Setting>
             </Group>
-            <Group name="Empty Terrain.mis">
+            <Group name="DefaultEditorLevel.mis">
                 <Setting name="cameraSpeed">25</Setting>
             </Group>
             <Group name="EmptyLevel.mis">
                 <Setting name="cameraSpeed">25</Setting>
             </Group>
+            <Group name="Empty Terrain.mis">
+                <Setting name="cameraSpeed">25</Setting>
+            </Group>
+            <Group name="PbrMatTest.mis">
+                <Setting name="cameraSpeed">5</Setting>
+            </Group>
         </Group>
     </Group>
-    <Group name="Assets">
-        <Setting name="AssetImporDefaultConfig">TestConfig</Setting>
-        <Setting name="AutoImport">1</Setting>
-        <Group name="Browser">
-            <Setting name="previewTileSize">small</Setting>
-        </Group>
+    <Group name="MeshRoadEditor">
+        <Setting name="DefaultNormal">0 0 1</Setting>
+        <Setting name="DefaultWidth">10</Setting>
+        <Setting name="HoverSplineColor">255 0 0 255</Setting>
+        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
+        <Setting name="sideMaterialName">DefaultRoadMaterialOther</Setting>
+        <Setting name="topMaterialName">DefaultRoadMaterialTop</Setting>
     </Group>
     <Group name="NavEditor">
         <Setting name="backgroundBuild">1</Setting>
-        <Setting name="spawnDatablock">DefaultPlayerData</Setting>
         <Setting name="SpawnClass">AIPlayer</Setting>
+        <Setting name="spawnDatablock">DefaultPlayerData</Setting>
+    </Group>
+    <Group name="RiverEditor">
+        <Setting name="DefaultDepth">5</Setting>
+        <Setting name="DefaultNormal">0 0 1</Setting>
+        <Setting name="DefaultWidth">10</Setting>
+        <Setting name="HoverNodeColor">255 255 255 255</Setting>
+        <Setting name="HoverSplineColor">255 0 0 255</Setting>
+        <Setting name="SelectedSplineColor">0 255 0 255</Setting>
     </Group>
     <Group name="RoadEditor">
+        <Setting name="DefaultWidth">10</Setting>
         <Setting name="HoverNodeColor">255 255 255 255</Setting>
         <Setting name="materialName">DefaultDecalRoadMaterial</Setting>
         <Setting name="SelectedSplineColor">0 255 0 255</Setting>
-        <Setting name="DefaultWidth">10</Setting>
+    </Group>
+    <Group name="ShapeEditor">
+        <Setting name="AdvancedWndVisible">1</Setting>
+        <Setting name="backgroundColor">0 0 0 100</Setting>
+        <Setting name="gridDimension">40 40</Setting>
+        <Setting name="gridSize">0.1</Setting>
+        <Setting name="highlightMaterial">1</Setting>
+        <Setting name="RenderCollision">0</Setting>
+        <Setting name="renderMounts">1</Setting>
+        <Setting name="showBounds">0</Setting>
+        <Setting name="ShowGrid">1</Setting>
+        <Setting name="showNodes">1</Setting>
+        <Setting name="showObjBox">1</Setting>
+        <Setting name="SunAmbientColor">180 180 180 255</Setting>
+        <Setting name="SunAngleX">45</Setting>
+        <Setting name="SunAngleZ">135</Setting>
+        <Setting name="SunDiffuseColor">255 255 255 255</Setting>
+    </Group>
+    <Group name="TerrainEditor">
+        <Setting name="currentAction">lowerHeight</Setting>
+        <Group name="ActionValues">
+            <Setting name="adjustHeightVal">10</Setting>
+            <Setting name="noiseFactor">1</Setting>
+            <Setting name="scaleVal">1</Setting>
+            <Setting name="setHeightVal">100</Setting>
+            <Setting name="SlopeMaxAngle">90</Setting>
+            <Setting name="SlopeMinAngle">0</Setting>
+            <Setting name="smoothFactor">0.1</Setting>
+            <Setting name="softSelectDefaultFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
+            <Setting name="softSelectFilter">1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000</Setting>
+            <Setting name="softSelectRadius">50</Setting>
+        </Group>
+        <Group name="Brush">
+            <Setting name="brushPressure">1</Setting>
+            <Setting name="brushSize">40 40</Setting>
+            <Setting name="brushSoftness">1</Setting>
+            <Setting name="brushType">ellipse</Setting>
+            <Setting name="maxBrushSize">40 40</Setting>
+        </Group>
     </Group>
     <Group name="Theme">
+        <Setting name="dividerDarkColor">17 16 15 255</Setting>
         <Setting name="dividerLightColor">96 94 92 255</Setting>
+        <Setting name="dividerMidColor">50 49 48 255</Setting>
+        <Setting name="fieldBGColor">59 58 57 255</Setting>
+        <Setting name="fieldBGHLColor">72 70 68 255</Setting>
         <Setting name="fieldBGSELColor">100 98 96 255</Setting>
+        <Setting name="fieldTextColor">178 175 172 255</Setting>
         <Setting name="fieldTextHLColor">234 232 230 255</Setting>
-        <Setting name="tabsSELColor">59 58 57 255</Setting>
-        <Setting name="dividerMidColor">50 49 48 255</Setting>
+        <Setting name="fieldTextNAColor">120 120 120 255</Setting>
+        <Setting name="fieldTextSELColor">255 255 255 255</Setting>
         <Setting name="headerColor">50 49 48 255</Setting>
-        <Setting name="windowBackgroundColor">32 31 30 255</Setting>
-        <Setting name="dividerDarkColor">17 16 15 255</Setting>
-        <Setting name="fieldBGColor">59 58 57 255</Setting>
+        <Setting name="headerTextColor">236 234 232 255</Setting>
+        <Setting name="tabsColor">37 36 35 255</Setting>
         <Setting name="tabsHLColor">50 49 48 255</Setting>
-        <Setting name="fieldTextNAColor">120 120 120 255</Setting>
+        <Setting name="tabsSELColor">59 58 57 255</Setting>
         <Setting name="tooltipBGColor">43 43 43 255</Setting>
         <Setting name="tooltipDividerColor">72 70 68 255</Setting>
-        <Setting name="fieldTextColor">178 175 172 255</Setting>
-        <Setting name="fieldBGHLColor">72 70 68 255</Setting>
-        <Setting name="tabsColor">37 36 35 255</Setting>
-        <Setting name="headerTextColor">236 234 232 255</Setting>
         <Setting name="tooltipTextColor">255 255 255 255</Setting>
-        <Setting name="fieldTextSELColor">255 255 255 255</Setting>
-    </Group>
-    <Group name="DatablockEditor">
-        <Setting name="libraryTab">1</Setting>
+        <Setting name="windowBackgroundColor">32 31 30 255</Setting>
     </Group>
-    <Group name="ConvexEditor">
-        <Setting name="materialName">Grid_512_Orange</Setting>
+    <Group name="WorldEditor">
+        <Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
+        <Setting name="displayType">6</Setting>
+        <Setting name="dropType">screenCenter</Setting>
+        <Setting name="EditorLayoutMode">Modern</Setting>
+        <Setting name="forceLoadDAE">0</Setting>
+        <Setting name="forceSidebarToSide">1</Setting>
+        <Setting name="lastEditedLevel">FPSGameplay:EmptyLevel</Setting>
+        <Setting name="orthoFOV">50</Setting>
+        <Setting name="orthoShowGrid">1</Setting>
+        <Setting name="recentLevelsList">FPSGameplay:EmptyLevel,FPSGameplay:EmptyTerrain,pbr:PbrMatTestLevel,TTR:DasBootLevel</Setting>
+        <Setting name="startupMode">Blank Level</Setting>
+        <Setting name="torsionPath">AssetWork_Debug.exe</Setting>
+        <Setting name="undoLimit">40</Setting>
+        <Group name="Color">
+            <Setting name="dragRectColor">255 255 0 255</Setting>
+            <Setting name="objectTextColor">255 255 255 255</Setting>
+            <Setting name="objMouseOverColor">0 255 0 255</Setting>
+            <Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
+            <Setting name="objSelectColor">255 0 0 255</Setting>
+            <Setting name="popupBackgroundColor">100 100 100 255</Setting>
+            <Setting name="selectionBoxColor">255 255 0 255</Setting>
+        </Group>
+        <Group name="Docs">
+            <Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
+            <Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
+            <Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
+            <Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
+        </Group>
+        <Group name="Grid">
+            <Setting name="gridColor">102 102 102 100</Setting>
+            <Setting name="gridMinorColor">51 51 51 100</Setting>
+            <Setting name="gridOriginColor">255 255 255 100</Setting>
+            <Setting name="gridSize">1</Setting>
+            <Setting name="gridSnap">0</Setting>
+        </Group>
+        <Group name="Images">
+            <Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
+            <Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
+            <Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
+        </Group>
+        <Group name="Layout">
+            <Setting name="LayoutMode">Classic</Setting>
+        </Group>
+        <Group name="ObjectIcons">
+            <Setting name="fadeIcons">1</Setting>
+            <Setting name="fadeIconsEndAlpha">0</Setting>
+            <Setting name="fadeIconsEndDist">20</Setting>
+            <Setting name="fadeIconsStartAlpha">255</Setting>
+            <Setting name="fadeIconsStartDist">8</Setting>
+        </Group>
+        <Group name="Render">
+            <Setting name="renderObjHandle">1</Setting>
+            <Setting name="renderObjText">1</Setting>
+            <Setting name="renderPopupBackground">1</Setting>
+            <Setting name="renderSelectionBox">1</Setting>
+            <Setting name="showMousePopupInfo">1</Setting>
+        </Group>
+        <Group name="Theme">
+            <Setting name="windowTitleBGColor">50 50 50 255</Setting>
+            <Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
+            <Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
+            <Setting name="windowTitleFontColor">215 215 215 255</Setting>
+            <Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
+        </Group>
+        <Group name="Tools">
+            <Setting name="boundingBoxCollision">0</Setting>
+            <Setting name="dropAtScreenCenterMax">100</Setting>
+            <Setting name="dropAtScreenCenterScalar">1</Setting>
+            <Setting name="objectsUseBoxCenter">1</Setting>
+            <Setting name="OffsetZValue">0.01</Setting>
+            <Setting name="snapGround">0</Setting>
+            <Setting name="snapSoft">0</Setting>
+            <Setting name="snapSoftSize">2</Setting>
+            <Setting name="TerrainSnapOffsetZ">0</Setting>
+        </Group>
     </Group>
 </EditorSettings>

Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs

@@ -443,6 +443,9 @@ function EditorOpenMission(%levelAsset)
          error("Selected Level Asset doesn't have a valid levelFile path!");
          return;
       }
+      
+      //We cool, so dereference the def because we don't need it the rest of the way
+      AssetDatabase.releaseAsset(%levelAssetId);
    }
       
    // close the current editor, it will get cleaned up by MissionCleanup
@@ -457,11 +460,11 @@ function EditorOpenMission(%levelAsset)
    if( !$missionRunning )
    {
       activatePackage( "BootEditor" );
-      StartGame( %filename );
+      StartGame( %levelAssetId );
    }
    else
    {
-      loadMission( %filename, true ) ;
+      loadMission( %levelAssetId, true ) ;
    
       pushInstantGroup();
 

Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs

@@ -119,11 +119,14 @@ function EditorGui::buildMenus(%this)
       profile = "ToolsGuiMenuBarProfile";
    };
    
-   %recentLevelsMenu = new PopupMenu(RecentLevelsPopupMenu)
+   if(!isObject(RecentLevelsPopupMenu))
    {
-      superClass = "MenuBuilder";
-      class = "EditorFileMenu";
-   };
+      %recentLevelsMenu = new PopupMenu(RecentLevelsPopupMenu)
+      {
+         superClass = "MenuBuilder";
+         class = "EditorFileMenu";
+      };
+   }
    
    // File Menu
    %fileMenu = new PopupMenu()