Browse Source

Corrects groundplane assigned material in the example and editor levels
Assetifies GroundPlane's handling of it's material field

Areloch 4 years ago
parent
commit
fb5195dd44

+ 1 - 1
Engine/source/T3D/groundPlane.cpp

@@ -144,7 +144,7 @@ bool GroundPlane::_setMaterialName(void* obj, const char* index, const char* dat
       //the TSStatic
       //the TSStatic
       if (gp->setMaterialAsset(assetId))
       if (gp->setMaterialAsset(assetId))
       {
       {
-         if (assetId == StringTable->insert("Core_Rendering:noMaterial"))
+         if (assetId == StringTable->insert("Core_Rendering:NoMaterial"))
          {
          {
             gp->mMaterialName = data;
             gp->mMaterialName = data;
             gp->mMaterialAssetId = StringTable->EmptyString();
             gp->mMaterialAssetId = StringTable->EmptyString();

+ 1 - 2
Templates/BaseGame/game/data/ExampleModule/levels/ExampleLevel.mis

@@ -36,7 +36,7 @@ new Scene(EditorTemplateLevel) {
       squareSize = "128";
       squareSize = "128";
       scaleU = "25";
       scaleU = "25";
       scaleV = "25";
       scaleV = "25";
-      Material = "Grid_512_Grey";
+      Material = "FloorGray";
       canSave = "1";
       canSave = "1";
       canSaveDynamicFields = "1";
       canSaveDynamicFields = "1";
          Enabled = "1";
          Enabled = "1";
@@ -100,7 +100,6 @@ new Scene(EditorTemplateLevel) {
       canSave = "1";
       canSave = "1";
       canSaveDynamicFields = "1";
       canSaveDynamicFields = "1";
       persistentId = "fff282f5-dced-11e9-a423-bb0e346e3870";
       persistentId = "fff282f5-dced-11e9-a423-bb0e346e3870";
-         reflectionPath = "D:/Gamedev/T3DMIT/T3DPreview4_0/Bugfixaroo/My Projects/Bugfixaroo/game/data/ExampleModule/levels/ExampleLevel/probes/";
    };
    };
 };
 };
 //--- OBJECT WRITE END ---
 //--- OBJECT WRITE END ---

+ 0 - 1
Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis

@@ -109,7 +109,6 @@ new Scene(EditorTemplateLevel) {
       canSave = "1";
       canSave = "1";
       canSaveDynamicFields = "1";
       canSaveDynamicFields = "1";
       persistentId = "d5eb3afb-dced-11e9-a423-bb0e346e3870";
       persistentId = "d5eb3afb-dced-11e9-a423-bb0e346e3870";
-         reflectionPath = "tools/levels/BlankRoom/probes/";
    };
    };
 };
 };
 //--- OBJECT WRITE END ---
 //--- OBJECT WRITE END ---

+ 1 - 2
Templates/BaseGame/game/tools/levels/EditorTemplateLevel.mis

@@ -88,7 +88,7 @@ new Scene(EditorTemplateLevel) {
       squareSize = "128";
       squareSize = "128";
       scaleU = "25";
       scaleU = "25";
       scaleV = "25";
       scaleV = "25";
-      Material = "Grid_512_Grey";
+      Material = "Prototyping:FloorGray";
       canSave = "1";
       canSave = "1";
       canSaveDynamicFields = "1";
       canSaveDynamicFields = "1";
          Enabled = "1";
          Enabled = "1";
@@ -104,7 +104,6 @@ new Scene(EditorTemplateLevel) {
       canSave = "1";
       canSave = "1";
       canSaveDynamicFields = "1";
       canSaveDynamicFields = "1";
       persistentId = "d5eb3afb-dced-11e9-a423-bb0e346e3870";
       persistentId = "d5eb3afb-dced-11e9-a423-bb0e346e3870";
-         reflectionPath = "tools/levels/BlankRoom/probes/";
    };
    };
 };
 };
 //--- OBJECT WRITE END ---
 //--- OBJECT WRITE END ---