From 6f9574731197babe9cd51cff9679a4523e597b32 Mon Sep 17 00:00:00 2001 From: Johxz Date: Fri, 23 Jun 2017 21:13:30 -0500 Subject: [PATCH] Fix unable to load texture warnmat --- .../BaseGame/game/tools/gui/materialSelector.ed.gui | 10 +++++----- Templates/BaseGame/game/tools/gui/uvEditor.ed.gui | 2 +- .../tools/materialEditor/scripts/materialEditor.ed.cs | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui b/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui index a4d2f6078..8be5db077 100644 --- a/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui +++ b/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui @@ -1154,14 +1154,14 @@ function MaterialSelector::buildPreviewArray( %this, %material ) %matName = %material.getInternalName(); if( %material.diffuseMap $= "") - %previewImage = "core/art/warnmat"; + %previewImage = "core/images/warnmat"; else %previewImage = %material.diffuseMap; } else if( %material.toneMap[0] $= "" && %material.diffuseMap[0] $= "" && !isObject(%material.cubemap) ) { %matName = %material.name; - %previewImage = "core/art/warnmat"; + %previewImage = "core/images/warnmat"; } else { @@ -1611,7 +1611,7 @@ function MaterialSelector::createNewMaterial( %this ) new Material(%material) { - diffuseMap[0] = "core/art/warnMat"; + diffuseMap[0] = "core/images/warnmat"; mapTo = "unmapped_mat"; parentGroup = RootGroup; }; @@ -1649,7 +1649,7 @@ function MaterialSelector::createNewMaterial( %this ) position = "7 4"; extent = "64 64"; buttonType = "PushButton"; - bitmap = "core/art/warnMat"; + bitmap = "core/images/warnmat"; Command = ""; text = "Loading..."; useStates = false; @@ -1690,7 +1690,7 @@ function MaterialSelector::createNewMaterial( %this ) } // select me - MaterialSelector.updateSelection( %material, "core/art/warnMat.png" ); + MaterialSelector.updateSelection( %material, "core/images/warnmat.png" ); } //needs to be deleted with the persistence manager and needs to be blanked out of the matmanager diff --git a/Templates/BaseGame/game/tools/gui/uvEditor.ed.gui b/Templates/BaseGame/game/tools/gui/uvEditor.ed.gui index c27f8498e..412111311 100644 --- a/Templates/BaseGame/game/tools/gui/uvEditor.ed.gui +++ b/Templates/BaseGame/game/tools/gui/uvEditor.ed.gui @@ -501,7 +501,7 @@ function UVEditor::showDialog( %this, %applyCallback, %obj, %uv) %material = %obj.material; if( %material.toneMap[0] $= "" && %material.diffuseMap[0] $= "" && !isObject(%material.cubemap) ) { - %previewImage = "core/art/warnmat"; + %previewImage = "core/images/warnmat"; } else { diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.cs b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.cs index b4e85229f..6564362e4 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.cs +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.cs @@ -1944,7 +1944,7 @@ function MaterialEditorGui::createNewMaterial( %this ) %material = getUniqueName( "newMaterial" ); new Material(%material) { - diffuseMap[0] = "core/art/warnmat"; + diffuseMap[0] = "core/images/warnmat"; mapTo = "unmapped_mat"; parentGroup = RootGroup; }; @@ -1975,7 +1975,7 @@ function MaterialEditorGui::deleteMaterial( %this ) %toMaterial = getUniqueName( "newMaterial" ); new Material(%toMaterial) { - diffuseMap[0] = "core/art/warnmat"; + diffuseMap[0] = "core/images/warnmat"; mapTo = "unmapped_mat"; parentGroup = RootGroup; }; @@ -1993,7 +1993,7 @@ function MaterialEditorGui::deleteMaterial( %this ) %toMaterial = getUniqueName( "newMaterial" ); new Material(%toMaterial) { - diffuseMap[0] = "core/art/warnmat"; + diffuseMap[0] = "core/images/warnmat"; mapTo = "unmapped_mat"; parentGroup = RootGroup; }; @@ -2008,7 +2008,7 @@ function MaterialEditorGui::deleteMaterial( %this ) %newMaterial = getUniqueName( "newMaterial" ); new Material(%newMaterial) { - diffuseMap[0] = "core/art/warnmat"; + diffuseMap[0] = "core/images/warnmat"; mapTo = "unmapped_mat"; parentGroup = RootGroup; };