#5565: Fix a couple of change-tracking bugs

codereader · Mar 28, 2021 · c87c44d · c87c44d
1 parent d9ac8bb
commit c87c44d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/radiant/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/editor/MaterialEditor.cpp
@@ -1140,6 +1140,7 @@ bool MaterialEditor::saveCurrentMaterial()
     }
 
     updateMaterialTreeItem();
+    updateMaterialControlSensitivity();
 
     return true;
 }
@@ -1216,6 +1217,7 @@ void MaterialEditor::handleMaterialSelectionChange()
         _material->sig_materialChanged().connect([this]()
         {
             updateSourceView();
+            updateMaterialTreeItem();
         });
     }
     else
@@ -2017,7 +2019,7 @@ void MaterialEditor::_onMaterialTypeChoice(wxCommandEvent& ev)
 
 void MaterialEditor::_onAddStageTransform(wxCommandEvent& ev)
 {
-    auto selectedStage = getSelectedStage();
+    auto selectedStage = getEditableStageForSelection();
 
     if (selectedStage)
     {
@@ -2027,6 +2029,7 @@ void MaterialEditor::_onAddStageTransform(wxCommandEvent& ev)
         selectedStage->appendTransformation(IShaderLayer::Transformation{ type });
 
         updateStageControls();
+        onMaterialChanged();
     }
 }
 
@@ -2042,6 +2045,7 @@ void MaterialEditor::_onRemoveStageTransform(wxCommandEvent& ev)
         stage->removeTransformation(index);
 
         updateStageControls();
+        onMaterialChanged();
     }
 }
 
@@ -2086,6 +2090,7 @@ void MaterialEditor::_onStageTransformEdited(wxDataViewEvent& ev)
 #endif
 
     stage->updateTransformation(transformIndex, type, expression1, expression2);
+    onMaterialChanged();
 }
 
 void MaterialEditor::_onStageColoredChecked(const IEditableShaderLayer::Ptr& stage, bool newValue)

diff --git a/radiantcore/shaders/Doom3ShaderLayer.cpp b/radiantcore/shaders/Doom3ShaderLayer.cpp
@@ -854,6 +854,7 @@ void Doom3ShaderLayer::removeTransformation(std::size_t index)
     _transformations.erase(_transformations.begin() + index);
 
     recalculateTransformationMatrix();
+    _material.onLayerChanged();
 }
 
 void Doom3ShaderLayer::updateTransformation(std::size_t index, TransformType type, const std::string& expression1, const std::string& expression2)

diff --git a/radiantcore/shaders/MaterialSourceGenerator.cpp b/radiantcore/shaders/MaterialSourceGenerator.cpp
@@ -659,7 +659,7 @@ void MaterialSourceGenerator::WriteFullMaterialToStream(std::ostream& stream, co
     stream << material->getName() << "\n";
     stream << "{";
     stream << material->getDefinition();
-    stream << "}" << "\n" << std::endl;
+    stream << "}" << std::endl;
 }
 
 }