#5565: Bind editor image controls

codereader · Mar 26, 2021 · 7d0aeaf · 7d0aeaf
1 parent 51ac2ff
commit 7d0aeaf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/radiant/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/editor/MaterialEditor.cpp
@@ -261,6 +261,21 @@ void MaterialEditor::setupMaterialProperties()
     // Place map expression controls where needed
     convertTextCtrlToMapExpressionEntry("MaterialStageImageMap");
     convertTextCtrlToMapExpressionEntry("MaterialLightFalloffMap");
+    convertTextCtrlToMapExpressionEntry("MaterialEditorImage");
+
+    auto editorImage = getControl<MapExpressionEntry>("MaterialEditorImage");
+    _materialBindings.emplace(std::make_shared<ExpressionBinding<MaterialPtr>>(editorImage->GetTextCtrl(),
+        [](const MaterialPtr& material)
+        {
+            auto expr = material->getEditorImageExpression();
+            return expr ? expr->getExpressionString() : std::string();
+        },
+        [this](const MaterialPtr& material, const std::string& value)
+        {
+            if (_materialUpdateInProgress || !_material) return;
+            material->setEditorImageExpressionFromString(value);
+        },
+        [this]() { onMaterialChanged(); }));
 
     auto* typeDropdown = getControl<wxChoice>("MaterialType");
 

diff --git a/radiantcore/shaders/CShader.cpp b/radiantcore/shaders/CShader.cpp
@@ -96,6 +96,8 @@ IMapExpression::Ptr CShader::getEditorImageExpression()
 void CShader::setEditorImageExpressionFromString(const std::string& editorImagePath)
 {
     ensureTemplateCopy();
+
+    _editorTexture.reset();
     _template->setEditorImageExpressionFromString(editorImagePath);
 }