#5565: Export qer_editorimage

codereader · Mar 26, 2021 · 84986ba · 84986ba
1 parent 7d0aeaf
commit 84986ba
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/radiantcore/shaders/MaterialSourceGenerator.cpp b/radiantcore/shaders/MaterialSourceGenerator.cpp
@@ -355,6 +355,11 @@ std::ostream& operator<<(std::ostream& stream, ShaderTemplate& shaderTemplate)
 {
     stream << "\n";
 
+    if (shaderTemplate.getEditorTexture())
+    {
+        stream << "\tqer_editorimage " << shaderTemplate.getEditorTexture()->getExpressionString() << "\n";
+    }
+
     if (shaderTemplate.getSurfaceType() != Material::SURFTYPE_DEFAULT)
     {
         stream << "\t" << getStringForSurfaceType(shaderTemplate.getSurfaceType()) << "\n";

diff --git a/radiantcore/shaders/ShaderTemplate.cpp b/radiantcore/shaders/ShaderTemplate.cpp
@@ -79,13 +79,7 @@ void ShaderTemplate::setEditorImageExpressionFromString(const std::string& expre
 {
     if (!_parsed) parseDefinition();
 
-    if (expression.empty())
-    {
-        _editorTex.reset();
-        return;
-    }
-
-    _editorTex = MapExpression::createForString(expression);
+    _editorTex = !expression.empty() ? MapExpression::createForString(expression) : MapExpressionPtr();
     onTemplateChanged();
 }
 

diff --git a/test/MaterialExport.cpp b/test/MaterialExport.cpp
@@ -1008,4 +1008,17 @@ TEST_F(MaterialExportTest, FragmentPrograms)
     expectDefinitionContains(material, "fragmentMap 2 temp/texture");
 }
 
+TEST_F(MaterialExportTest, EditorImage)
+{
+    auto material = GlobalMaterialManager().getMaterial("textures/exporttest/empty");
+
+    EXPECT_EQ(string::trim_copy(material->getDefinition()), "");
+
+    material->setEditorImageExpressionFromString("textures/numbers/0.tga");
+    expectDefinitionContains(material, "qer_editorimage textures/numbers/0.tga");
+
+    material->setEditorImageExpressionFromString("");
+    expectDefinitionDoesNotContain(material, "qer_editorimage");
+}
+
 }