浏览代码

Merge pull request #1678 from Areloch/LinCaseSenxitivityfixNumber203

Fix a few more case sensitivity issues
Areloch 9 年之前
父节点
当前提交
03a3d7fefd
共有 44 个文件被更改,包括 70 次插入70 次删除
  1. 2 2
      Templates/Full/game/tools/decalEditor/decalEditorGui.cs
  2. 0 0
      Templates/Full/game/tools/materialEditor/gui/cubePreview.dts
  3. 0 0
      Templates/Full/game/tools/materialEditor/gui/cylinderPreview.dts
  4. 6 6
      Templates/Full/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui
  5. 8 8
      Templates/Full/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
  6. 0 0
      Templates/Full/game/tools/materialEditor/gui/spherePreview.dts
  7. 0 0
      Templates/Full/game/tools/materialEditor/gui/torusPreview.dts
  8. 0 0
      Templates/Full/game/tools/materialEditor/gui/torusknotPreview.dts
  9. 29 29
      Templates/Full/game/tools/materialEditor/scripts/materialEditor.ed.cs
  10. 1 1
      Templates/Full/game/tools/particleEditor/ParticleEditor.ed.gui
  11. 1 1
      Templates/Full/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui
  12. 3 3
      Templates/Full/game/tools/worldEditor/gui/ToolsPaletteGroups/ForestEditorPalette.ed.gui
  13. 8 8
      Templates/Full/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui
  14. 0 0
      Templates/Full/game/tools/worldEditor/images/boxBrush_d.png
  15. 0 0
      Templates/Full/game/tools/worldEditor/images/boxBrush_h.png
  16. 0 0
      Templates/Full/game/tools/worldEditor/images/boxBrush_n.png
  17. 0 0
      Templates/Full/game/tools/worldEditor/images/circleBrush_d.png
  18. 0 0
      Templates/Full/game/tools/worldEditor/images/circleBrush_h.png
  19. 0 0
      Templates/Full/game/tools/worldEditor/images/circleBrush_n.png
  20. 0 0
      Templates/Full/game/tools/worldEditor/images/clearEmpty_d.png
  21. 0 0
      Templates/Full/game/tools/worldEditor/images/clearEmpty_h.png
  22. 0 0
      Templates/Full/game/tools/worldEditor/images/clearEmpty_n.png
  23. 0 0
      Templates/Full/game/tools/worldEditor/images/flattenHeight_d.png
  24. 0 0
      Templates/Full/game/tools/worldEditor/images/flattenHeight_h.png
  25. 0 0
      Templates/Full/game/tools/worldEditor/images/flattenHeight_n.png
  26. 0 0
      Templates/Full/game/tools/worldEditor/images/lowerHeight_d.png
  27. 0 0
      Templates/Full/game/tools/worldEditor/images/lowerHeight_h.png
  28. 0 0
      Templates/Full/game/tools/worldEditor/images/lowerHeight_n.png
  29. 0 0
      Templates/Full/game/tools/worldEditor/images/raiseHeight_d.png
  30. 0 0
      Templates/Full/game/tools/worldEditor/images/raiseHeight_h.png
  31. 0 0
      Templates/Full/game/tools/worldEditor/images/raiseHeight_n.png
  32. 0 0
      Templates/Full/game/tools/worldEditor/images/setEmpty_d.png
  33. 0 0
      Templates/Full/game/tools/worldEditor/images/setEmpty_h.png
  34. 0 0
      Templates/Full/game/tools/worldEditor/images/setEmpty_n.png
  35. 0 0
      Templates/Full/game/tools/worldEditor/images/setHeight_d.png
  36. 0 0
      Templates/Full/game/tools/worldEditor/images/setHeight_h.png
  37. 0 0
      Templates/Full/game/tools/worldEditor/images/setHeight_n.png
  38. 0 0
      Templates/Full/game/tools/worldEditor/images/smoothHeight_d.png
  39. 0 0
      Templates/Full/game/tools/worldEditor/images/smoothHeight_h.png
  40. 0 0
      Templates/Full/game/tools/worldEditor/images/smoothHeight_n.png
  41. 0 0
      Templates/Full/game/tools/worldEditor/images/softCurve_d.png
  42. 0 0
      Templates/Full/game/tools/worldEditor/images/softCurve_h.png
  43. 0 0
      Templates/Full/game/tools/worldEditor/images/softCurve_n.png
  44. 12 12
      Templates/Full/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.cs

+ 2 - 2
Templates/Full/game/tools/decalEditor/decalEditorGui.cs

@@ -315,7 +315,7 @@ function DecalEditorGui::updateDecalPreview( %this, %material )
    if( isObject( %material ) )
       DecalPreviewWindow-->decalPreview.setBitmap( MaterialEditorGui.searchForTexture( %material.getId(), %material.diffuseMap[0]) );
    else
-      DecalPreviewWindow-->decalPreview.setBitmap("tools/materialeditor/gui/unknownImage");
+      DecalPreviewWindow-->decalPreview.setBitmap("tools/materialEditor/gui/unknownImage");
 }
 
 function DecalEditorGui::updateInstancePreview( %this, %material )
@@ -323,7 +323,7 @@ function DecalEditorGui::updateInstancePreview( %this, %material )
    if( isObject( %material ) )
       DecalPreviewWindow-->instancePreview.setBitmap( MaterialEditorGui.searchForTexture( %material.getId(), %material.diffuseMap[0]) );      
    else
-      DecalPreviewWindow-->instancePreview.setBitmap("tools/materialeditor/gui/unknownImage");   
+      DecalPreviewWindow-->instancePreview.setBitmap("tools/materialEditor/gui/unknownImage");   
 }
 
 function DecalEditorGui::rebuildInstanceTree( %this )

+ 0 - 0
Templates/Full/game/tools/materialEditor/gui/cubepreview.dts → Templates/Full/game/tools/materialEditor/gui/cubePreview.dts


+ 0 - 0
Templates/Full/game/tools/materialEditor/gui/cylinderpreview.dts → Templates/Full/game/tools/materialEditor/gui/cylinderPreview.dts


+ 6 - 6
Templates/Full/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui

@@ -365,7 +365,7 @@
          canSave = "1";
          Visible = "1";
          hovertime = "1000";
-         bitmap = "tools/materialeditor/gui/unknownImage";
+         bitmap = "tools/materialEditor/gui/unknownImage";
          wrap = "0";
       };
       new GuiTextCtrl(matEd_cubeMapEd_xPosTxt) {
@@ -408,7 +408,7 @@
          canSave = "1";
          Visible = "1";
          hovertime = "1000";
-         bitmap = "tools/materialeditor/gui/unknownImage";
+         bitmap = "tools/materialEditor/gui/unknownImage";
          wrap = "0";
       };
       new GuiTextCtrl(matEd_cubeMapEd_xNegTxt) {
@@ -451,7 +451,7 @@
          canSave = "1";
          Visible = "1";
          hovertime = "1000";
-         bitmap = "tools/materialeditor/gui/unknownImage";
+         bitmap = "tools/materialEditor/gui/unknownImage";
          wrap = "0";
       };
       new GuiTextCtrl(matEd_cubeMapEd_yPosTxt) {
@@ -494,7 +494,7 @@
          canSave = "1";
          Visible = "1";
          hovertime = "1000";
-         bitmap = "tools/materialeditor/gui/unknownImage";
+         bitmap = "tools/materialEditor/gui/unknownImage";
          wrap = "0";
       };
       new GuiTextCtrl(matEd_cubeMapEd_yNegTxt) {
@@ -537,7 +537,7 @@
          canSave = "1";
          Visible = "1";
          hovertime = "1000";
-         bitmap = "tools/materialeditor/gui/unknownImage";
+         bitmap = "tools/materialEditor/gui/unknownImage";
          wrap = "0";
       };
       new GuiTextCtrl(matEd_cubeMapEd_zPosTxt) {
@@ -580,7 +580,7 @@
          canSave = "1";
          Visible = "1";
          hovertime = "1000";
-         bitmap = "tools/materialeditor/gui/unknownImage";
+         bitmap = "tools/materialEditor/gui/unknownImage";
          wrap = "0";
       };
       new GuiTextCtrl(matEd_cubeMapEd_zNegTxt) {

+ 8 - 8
Templates/Full/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui

@@ -277,7 +277,7 @@
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiBitmapButtonCtrl() {
@@ -429,7 +429,7 @@
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiTextCtrl() {
@@ -555,7 +555,7 @@
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiTextCtrl() {
@@ -713,7 +713,7 @@
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiBitmapButtonCtrl() {
@@ -858,7 +858,7 @@
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiBitmapButtonCtrl() {
@@ -1003,7 +1003,7 @@
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiBitmapButtonCtrl() {
@@ -1129,7 +1129,7 @@
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiTextCtrl() {
@@ -1255,7 +1255,7 @@
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiTextCtrl() {

+ 0 - 0
Templates/Full/game/tools/materialEditor/gui/spherepreview.dts → Templates/Full/game/tools/materialEditor/gui/spherePreview.dts


+ 0 - 0
Templates/Full/game/tools/materialEditor/gui/toruspreview.dts → Templates/Full/game/tools/materialEditor/gui/torusPreview.dts


+ 0 - 0
Templates/Full/game/tools/materialEditor/gui/torusknotpreview.dts → Templates/Full/game/tools/materialEditor/gui/torusknotPreview.dts


+ 29 - 29
Templates/Full/game/tools/materialEditor/scripts/materialEditor.ed.cs

@@ -27,12 +27,12 @@ function MaterialEditorGui::establishMaterials(%this)
    //Cubemap used to preview other cubemaps in the editor.
    singleton CubemapData( matEdCubeMapPreviewMat )
    {
-      cubeFace[0] = "tools/materialeditor/gui/cube_xNeg";
-      cubeFace[1] = "tools/materialeditor/gui/cube_xPos";
-      cubeFace[2] = "tools/materialeditor/gui/cube_ZNeg";
-      cubeFace[3] = "tools/materialeditor/gui/cube_ZPos";
-      cubeFace[4] = "tools/materialeditor/gui/cube_YNeg";
-      cubeFace[5] = "tools/materialeditor/gui/cube_YPos";
+      cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
+      cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
+      cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
+      cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
+      cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
+      cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
       parentGroup = "RootGroup";
    };
    
@@ -40,7 +40,7 @@ function MaterialEditorGui::establishMaterials(%this)
    singleton Material(materialEd_previewMaterial)
    {
       mapTo = "matEd_mappedMat";
-      diffuseMap[0] = "tools/materialeditor/gui/matEd_mappedMat";
+      diffuseMap[0] = "tools/materialEditor/gui/matEd_mappedMat";
    };
 
    singleton CustomMaterial( materialEd_justAlphaMaterial )
@@ -371,32 +371,32 @@ function MaterialEditorGui::updatePreviewObject(%this)
 	{
 		case "sphere":
          matEd_quickPreview_Popup.selected = %newModel;
-         matEd_previewObjectView.setModel("tools/materialeditor/gui/spherePreview.dts");
+         matEd_previewObjectView.setModel("tools/materialEditor/gui/spherePreview.dts");
          matEd_previewObjectView.setOrbitDistance(4);
 				
 		case "cube":
          matEd_quickPreview_Popup.selected = %newModel;
-         matEd_previewObjectView.setModel("tools/materialeditor/gui/cubePreview.dts");
+         matEd_previewObjectView.setModel("tools/materialEditor/gui/cubePreview.dts");
          matEd_previewObjectView.setOrbitDistance(5);
 				
 		case "pyramid":
          matEd_quickPreview_Popup.selected = %newModel;
-         matEd_previewObjectView.setModel("tools/materialeditor/gui/pyramidPreview.dts");
+         matEd_previewObjectView.setModel("tools/materialEditor/gui/pyramidPreview.dts");
          matEd_previewObjectView.setOrbitDistance(5);
 				
 		case "cylinder":
          matEd_quickPreview_Popup.selected = %newModel;
-         matEd_previewObjectView.setModel("tools/materialeditor/gui/cylinderPreview.dts");
+         matEd_previewObjectView.setModel("tools/materialEditor/gui/cylinderPreview.dts");
          matEd_previewObjectView.setOrbitDistance(4.2);
 				
 		case "torus":
          matEd_quickPreview_Popup.selected = %newModel;
-         matEd_previewObjectView.setModel("tools/materialeditor/gui/torusPreview.dts");
+         matEd_previewObjectView.setModel("tools/materialEditor/gui/torusPreview.dts");
          matEd_previewObjectView.setOrbitDistance(4.2);
 				
 		case "knot":
          matEd_quickPreview_Popup.selected = %newModel;
-         matEd_previewObjectView.setModel("tools/materialeditor/gui/torusknotPreview.dts");
+         matEd_previewObjectView.setModel("tools/materialEditor/gui/torusknotPreview.dts");
 	}
 }
 
@@ -802,7 +802,7 @@ function MaterialEditorGui::guiSync( %this, %material )
    if((%material).diffuseMap[%layer] $= "") 
    {
       MaterialEditorPropertiesWindow-->diffuseMapNameText.setText( "None" );
-      MaterialEditorPropertiesWindow-->diffuseMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
+      MaterialEditorPropertiesWindow-->diffuseMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
    }
    else
    {
@@ -813,7 +813,7 @@ function MaterialEditorGui::guiSync( %this, %material )
    if((%material).normalMap[%layer] $= "") 
    {
       MaterialEditorPropertiesWindow-->normalMapNameText.setText( "None" );
-      MaterialEditorPropertiesWindow-->normalMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
+      MaterialEditorPropertiesWindow-->normalMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
    }
    else
    {
@@ -824,7 +824,7 @@ function MaterialEditorGui::guiSync( %this, %material )
    if((%material).overlayMap[%layer] $= "") 
    {
       MaterialEditorPropertiesWindow-->overlayMapNameText.setText( "None" );
-      MaterialEditorPropertiesWindow-->overlayMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
+      MaterialEditorPropertiesWindow-->overlayMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
    }
    else
    {
@@ -835,7 +835,7 @@ function MaterialEditorGui::guiSync( %this, %material )
    if((%material).detailMap[%layer] $= "") 
    {
       MaterialEditorPropertiesWindow-->detailMapNameText.setText( "None" );
-      MaterialEditorPropertiesWindow-->detailMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
+      MaterialEditorPropertiesWindow-->detailMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
    }
    else
    {
@@ -846,7 +846,7 @@ function MaterialEditorGui::guiSync( %this, %material )
    if((%material).detailNormalMap[%layer] $= "") 
    {
       MaterialEditorPropertiesWindow-->detailNormalMapNameText.setText( "None" );
-      MaterialEditorPropertiesWindow-->detailNormalMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
+      MaterialEditorPropertiesWindow-->detailNormalMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
    }
    else
    {
@@ -857,7 +857,7 @@ function MaterialEditorGui::guiSync( %this, %material )
    if((%material).lightMap[%layer] $= "") 
    {
       MaterialEditorPropertiesWindow-->lightMapNameText.setText( "None" );
-      MaterialEditorPropertiesWindow-->lightMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
+      MaterialEditorPropertiesWindow-->lightMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
    }
    else
    {
@@ -868,7 +868,7 @@ function MaterialEditorGui::guiSync( %this, %material )
    if((%material).toneMap[%layer] $= "") 
    {
       MaterialEditorPropertiesWindow-->toneMapNameText.setText( "None" );
-      MaterialEditorPropertiesWindow-->toneMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
+      MaterialEditorPropertiesWindow-->toneMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
    }
    else
    {
@@ -879,7 +879,7 @@ function MaterialEditorGui::guiSync( %this, %material )
    if((%material).specularMap[%layer] $= "") 
    {
       MaterialEditorPropertiesWindow-->specMapNameText.setText( "None" );
-      MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap( "tools/materialeditor/gui/unknownImage" );
+      MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap( "tools/materialEditor/gui/unknownImage" );
    }
    else
    {
@@ -1141,7 +1141,7 @@ function MaterialEditorGui::updateTextureMap( %this, %type, %action )
    else
    {
       %textCtrl.setText("None");
-      %bitmapCtrl.setBitmap("tools/materialeditor/gui/unknownImage");
+      %bitmapCtrl.setBitmap("tools/materialEditor/gui/unknownImage");
       MaterialEditorGui.updateActiveMaterial(%type @ "Map[" @ %layer @ "]","");
    }
 }
@@ -1185,7 +1185,7 @@ function MaterialEditorGui::updateSpecMap(%this,%action)
    else
    {
       MaterialEditorPropertiesWindow-->specMapNameText.setText("None");
-      MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap("tools/materialeditor/gui/unknownImage");
+      MaterialEditorPropertiesWindow-->specMapDisplayBitmap.setBitmap("tools/materialEditor/gui/unknownImage");
       MaterialEditorGui.updateActiveMaterial("specularMap[" @ %layer @ "]","");
    }
    
@@ -1604,12 +1604,12 @@ function MaterialEditorGui::createNewCubemap( %this, %cubemap )
    
    new CubemapData(%cubemap) 
    {
-      cubeFace[0] = "tools/materialeditor/gui/cube_xNeg";
-      cubeFace[1] = "tools/materialeditor/gui/cube_xPos";
-      cubeFace[2] = "tools/materialeditor/gui/cube_ZNeg";
-      cubeFace[3] = "tools/materialeditor/gui/cube_ZPos";
-      cubeFace[4] = "tools/materialeditor/gui/cube_YNeg";
-      cubeFace[5] = "tools/materialeditor/gui/cube_YPos";
+      cubeFace[0] = "tools/materialEditor/gui/cube_xNeg";
+      cubeFace[1] = "tools/materialEditor/gui/cube_xPos";
+      cubeFace[2] = "tools/materialEditor/gui/cube_ZNeg";
+      cubeFace[3] = "tools/materialEditor/gui/cube_ZPos";
+      cubeFace[4] = "tools/materialEditor/gui/cube_YNeg";
+      cubeFace[5] = "tools/materialEditor/gui/cube_YPos";
 
       parentGroup = RootGroup;
    };

+ 1 - 1
Templates/Full/game/tools/particleEditor/ParticleEditor.ed.gui

@@ -1862,7 +1862,7 @@ $PE_guielement_ext_colorpicker = "18 18";
                            canSave = "1";
                            Visible = "1";
                            hovertime = "1000";
-                           bitmap = "tools/materialeditor/gui/unknownImage";
+                           bitmap = "tools/materialEditor/gui/unknownImage";
                            wrap = "0";
                         };
                         new GuiTextCtrl() {

+ 1 - 1
Templates/Full/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui

@@ -158,7 +158,7 @@
             tooltipprofile = "ToolsGuiToolTipProfile";
             hovertime = "1000";
             wrap = "0";
-            bitmap= "tools/materialeditor/gui/unknownImage";
+            bitmap= "tools/materialEditor/gui/unknownImage";
          };
          new GuiBitmapCtrl(ETerrainMaterialSelectedBorder) {
             canSaveDynamicFields = "0";

+ 3 - 3
Templates/Full/game/tools/worldEditor/gui/ToolsPaletteGroups/ForestEditorPalette.ed.gui

@@ -113,7 +113,7 @@
       tooltipprofile = "ToolsGuiToolTipProfile";
       ToolTip = "Paint (5)";
       hovertime = "1000";
-      bitmap = "tools/foresteditor/images/paint-forest-btn";
+      bitmap = "tools/forestEditor/images/paint-forest-btn";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };
@@ -134,7 +134,7 @@
       tooltipprofile = "ToolsGuiToolTipProfile";
       ToolTip = "Erase (6)";
       hovertime = "1000";
-      bitmap = "tools/foresteditor/images/erase-all-btn";
+      bitmap = "tools/forestEditor/images/erase-all-btn";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };
@@ -156,7 +156,7 @@
       tooltipprofile = "ToolsGuiToolTipProfile";
       ToolTip = "Erase Selected (7)";
       hovertime = "1000";
-      bitmap = "tools/foresteditor/images/erase-element-btn";
+      bitmap = "tools/forestEditor/images/erase-element-btn";
       buttonType = "RadioButton";
       useMouseEvents = "0";
    };

+ 8 - 8
Templates/Full/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui

@@ -261,7 +261,7 @@
                Visible = "1";
                tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
-               bitmap = "tools/materialeditor/gui/unknownImage";
+               bitmap = "tools/materialEditor/gui/unknownImage";
                wrap = "0";
             };
             new GuiBitmapButtonCtrl() {
@@ -358,7 +358,7 @@
                MinExtent = "8 2";
                canSave = "1";
                Visible = "1";
-               Command = "TerrainMaterialDlg-->baseTexCtrl.setBitmap(\"tools/materialeditor/gui/unknownImage\");";
+               Command = "TerrainMaterialDlg-->baseTexCtrl.setBitmap(\"tools/materialEditor/gui/unknownImage\");";
                tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
                groupNum = "-1";
@@ -466,7 +466,7 @@
                Visible = "1";
                tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
-               bitmap = "tools/materialeditor/gui/unknownImage";
+               bitmap = "tools/materialEditor/gui/unknownImage";
                wrap = "0";
             };
             new GuiTextCtrl() {
@@ -563,7 +563,7 @@
                MinExtent = "8 2";
                canSave = "1";
                Visible = "1";
-               Command = "TerrainMaterialDlg-->normTexCtrl.setBitmap(\"tools/materialeditor/gui/unknownImage\");";
+               Command = "TerrainMaterialDlg-->normTexCtrl.setBitmap(\"tools/materialEditor/gui/unknownImage\");";
                tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
                groupNum = "-1";
@@ -662,7 +662,7 @@
             canSaveDynamicFields = "0";
 
             new GuiBitmapCtrl() {
-               bitmap = "tools/materialeditor/gui/unknownImage";
+               bitmap = "tools/materialEditor/gui/unknownImage";
                wrap = "0";
                position = "1 1";
                extent = "47 47";
@@ -787,7 +787,7 @@
                profile = "ToolsGuiDefaultProfile";
                visible = "1";
                active = "1";
-               command = "TerrainMaterialDlg-->macroTexCtrl.setBitmap(\"tools/materialeditor/gui/unknownImage\");";
+               command = "TerrainMaterialDlg-->macroTexCtrl.setBitmap(\"tools/materialEditor/gui/unknownImage\");";
                tooltipProfile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
                isContainer = "0";
@@ -999,7 +999,7 @@
                Visible = "1";
                tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
-               bitmap = "tools/materialeditor/gui/unknownImage";
+               bitmap = "tools/materialEditor/gui/unknownImage";
                wrap = "0";
             };
             new GuiBitmapButtonCtrl() {
@@ -1096,7 +1096,7 @@
                MinExtent = "8 2";
                canSave = "1";
                Visible = "1";
-               Command = "TerrainMaterialDlg-->detailTexCtrl.setBitmap(\"tools/materialeditor/gui/unknownImage\");";
+               Command = "TerrainMaterialDlg-->detailTexCtrl.setBitmap(\"tools/materialEditor/gui/unknownImage\");";
                tooltipprofile = "ToolsGuiToolTipProfile";
                hovertime = "1000";
                groupNum = "-1";

+ 0 - 0
Templates/Full/game/tools/worldEditor/images/boxBrush_d.PNG → Templates/Full/game/tools/worldEditor/images/boxBrush_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/boxBrush_h.PNG → Templates/Full/game/tools/worldEditor/images/boxBrush_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/boxBrush_n.PNG → Templates/Full/game/tools/worldEditor/images/boxBrush_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/circleBrush_d.PNG → Templates/Full/game/tools/worldEditor/images/circleBrush_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/circleBrush_h.PNG → Templates/Full/game/tools/worldEditor/images/circleBrush_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/circleBrush_n.PNG → Templates/Full/game/tools/worldEditor/images/circleBrush_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/clearEmpty_d.PNG → Templates/Full/game/tools/worldEditor/images/clearEmpty_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/clearEmpty_h.PNG → Templates/Full/game/tools/worldEditor/images/clearEmpty_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/clearEmpty_n.PNG → Templates/Full/game/tools/worldEditor/images/clearEmpty_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/flattenHeight_d.PNG → Templates/Full/game/tools/worldEditor/images/flattenHeight_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/flattenHeight_h.PNG → Templates/Full/game/tools/worldEditor/images/flattenHeight_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/flattenHeight_n.PNG → Templates/Full/game/tools/worldEditor/images/flattenHeight_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/lowerHeight_d.PNG → Templates/Full/game/tools/worldEditor/images/lowerHeight_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/lowerHeight_h.PNG → Templates/Full/game/tools/worldEditor/images/lowerHeight_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/lowerHeight_n.PNG → Templates/Full/game/tools/worldEditor/images/lowerHeight_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/raiseHeight_d.PNG → Templates/Full/game/tools/worldEditor/images/raiseHeight_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/raiseHeight_h.PNG → Templates/Full/game/tools/worldEditor/images/raiseHeight_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/raiseHeight_n.PNG → Templates/Full/game/tools/worldEditor/images/raiseHeight_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/setEmpty_d.PNG → Templates/Full/game/tools/worldEditor/images/setEmpty_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/setEmpty_h.PNG → Templates/Full/game/tools/worldEditor/images/setEmpty_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/setEmpty_n.PNG → Templates/Full/game/tools/worldEditor/images/setEmpty_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/setHeight_d.PNG → Templates/Full/game/tools/worldEditor/images/setHeight_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/setHeight_h.PNG → Templates/Full/game/tools/worldEditor/images/setHeight_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/setHeight_n.PNG → Templates/Full/game/tools/worldEditor/images/setHeight_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/smoothHeight_d.PNG → Templates/Full/game/tools/worldEditor/images/smoothHeight_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/smoothHeight_h.PNG → Templates/Full/game/tools/worldEditor/images/smoothHeight_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/smoothHeight_n.PNG → Templates/Full/game/tools/worldEditor/images/smoothHeight_n.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/softCurve_d.PNG → Templates/Full/game/tools/worldEditor/images/softCurve_d.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/softCurve_h.PNG → Templates/Full/game/tools/worldEditor/images/softCurve_h.png


+ 0 - 0
Templates/Full/game/tools/worldEditor/images/softCurve_n.PNG → Templates/Full/game/tools/worldEditor/images/softCurve_n.png


+ 12 - 12
Templates/Full/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.cs

@@ -218,7 +218,7 @@ function TerrainMaterialDlg::changeBase( %this )
       if( %ctrl.bitmap !$= "" )
          %file = %ctrl.bitmap;
       else
-         %file = "tools/materialeditor/gui/unknownImage";
+         %file = "tools/materialEditor/gui/unknownImage";
    }
    
    %file = makeRelativePath( %file, getMainDotCsDir() );
@@ -240,7 +240,7 @@ function TerrainMaterialDlg::changeDetail( %this )
       if( %ctrl.bitmap !$= "" )
          %file = %ctrl.bitmap;
       else
-         %file = "tools/materialeditor/gui/unknownImage";
+         %file = "tools/materialEditor/gui/unknownImage";
    }
    
    %file = makeRelativePath( %file, getMainDotCsDir() );
@@ -262,7 +262,7 @@ function TerrainMaterialDlg::changeMacro( %this )
       if( %ctrl.bitmap !$= "" )
          %file = %ctrl.bitmap;
       else
-         %file = "tools/materialeditor/gui/unknownImage";
+         %file = "tools/materialEditor/gui/unknownImage";
    }
    
    %file = makeRelativePath( %file, getMainDotCsDir() );
@@ -285,7 +285,7 @@ function TerrainMaterialDlg::changeNormal( %this )
       if( %ctrl.bitmap !$= "" )
          %file = %ctrl.bitmap;
       else
-         %file = "tools/materialeditor/gui/unknownImage";
+         %file = "tools/materialEditor/gui/unknownImage";
    }
 
    %file = makeRelativePath( %file, getMainDotCsDir() );
@@ -376,22 +376,22 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
       
       %this-->matNameCtrl.setText( %mat.internalName );
       if (%mat.diffuseMap $= ""){
-         %this-->baseTexCtrl.setBitmap( "tools/materialeditor/gui/unknownImage" );
+         %this-->baseTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
       }else{
          %this-->baseTexCtrl.setBitmap( %mat.diffuseMap ); 
       }
       if (%mat.detailMap $= ""){
-         %this-->detailTexCtrl.setBitmap( "tools/materialeditor/gui/unknownImage" );
+         %this-->detailTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
       }else{
          %this-->detailTexCtrl.setBitmap( %mat.detailMap );
       }
       if (%mat.macroMap $= ""){
-         %this-->macroTexCtrl.setBitmap( "tools/materialeditor/gui/unknownImage" );
+         %this-->macroTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
       }else{
          %this-->macroTexCtrl.setBitmap( %mat.macroMap );
       }      
       if (%mat.normalMap $= ""){
-         %this-->normTexCtrl.setBitmap( "tools/materialeditor/gui/unknownImage" );
+         %this-->normTexCtrl.setBitmap( "tools/materialEditor/gui/unknownImage" );
       }else{
          %this-->normTexCtrl.setBitmap( %mat.normalMap ); 
       }
@@ -428,22 +428,22 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
    
    %newName = %this-->matNameCtrl.getText(); 
    
-   if (%this-->baseTexCtrl.bitmap $= "tools/materialeditor/gui/unknownImage"){
+   if (%this-->baseTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
       %newDiffuse = "";
    }else{
       %newDiffuse = %this-->baseTexCtrl.bitmap;  
    }
-   if (%this-->normTexCtrl.bitmap $= "tools/materialeditor/gui/unknownImage"){
+   if (%this-->normTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
       %newNormal = "";
    }else{
       %newNormal = %this-->normTexCtrl.bitmap;  
    }
-   if (%this-->detailTexCtrl.bitmap $= "tools/materialeditor/gui/unknownImage"){
+   if (%this-->detailTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
       %newDetail = "";
    }else{
       %newDetail = %this-->detailTexCtrl.bitmap;  
    }
-   if (%this-->macroTexCtrl.bitmap $= "tools/materialeditor/gui/unknownImage"){
+   if (%this-->macroTexCtrl.bitmap $= "tools/materialEditor/gui/unknownImage"){
       %newMacro = "";
    }else{
       %newMacro = %this-->macroTexCtrl.bitmap;