#5567: Make sure editor image expression is carried over when cloning…

… templates
codereader · Apr 2, 2021 · c29cb37 · c29cb37
1 parent 0c88787
commit c29cb37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/radiant/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/editor/MaterialEditor.cpp
@@ -368,6 +368,7 @@ void MaterialEditor::setupBasicMaterialPage()
 
         _material->setEditorImageExpressionFromString(editorImageEntry->GetValue().ToStdString());
         updateStageBlendControls();
+        updateBasicImagePreview();
         onMaterialChanged();
     });
 

diff --git a/radiantcore/shaders/ShaderTemplate.cpp b/radiantcore/shaders/ShaderTemplate.cpp
@@ -56,6 +56,8 @@ ShaderTemplate::ShaderTemplate(const ShaderTemplate& other) :
     _parseFlags(other._parseFlags),
     _guiDeclName(other._guiDeclName)
 {
+    _editorTex = other._editorTex ? MapExpression::createForString(other._editorTex->getExpressionString()) : MapExpressionPtr();
+
     _ambientRimColour[0] = other._ambientRimColour[0];
     _ambientRimColour[1] = other._ambientRimColour[1];
     _ambientRimColour[2] = other._ambientRimColour[2];