#6199: ModelSelector actively connects the MaterialsList toggle event…

… to the scene::INode in the ModelPreview to trigger a refresh of its renderable geometry
codereader · Dec 26, 2022 · ca2c5e1 · ca2c5e1
1 parent 87b521f
commit ca2c5e1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/radiant/ui/modelselector/ModelSelector.cpp b/radiant/ui/modelselector/ModelSelector.cpp
@@ -126,7 +126,7 @@ void ModelSelector::setupAdvancedPanel(wxWindow* parent)
 
 	// Refresh preview when material visibility changed
     _materialsList->signal_visibilityChanged().connect(
-		sigc::mem_fun(*_modelPreview, &wxutil::ModelPreview::queueDraw)
+		sigc::mem_fun(*this, &ModelSelector::onMaterialVisibilityStatusChanged)
     );
 
     auto entityPage = findNamedPanel(parent, "ModelRelatedEntitiesPanel");
@@ -173,6 +173,17 @@ void ModelSelector::onShowClassDefinition()
     view->Destroy();
 }
 
+void ModelSelector::onMaterialVisibilityStatusChanged()
+{
+    // Tell the model to refresh its surfaces
+    if (_modelPreview->getModelNode())
+    {
+        _modelPreview->getModelNode()->onFiltersChanged();
+    }
+
+    _modelPreview->queueDraw();
+}
+
 void ModelSelector::onRelatedEntitySelectionChange(wxDataViewEvent& ev)
 {
     // Adjust the model preview to use the same skin

diff --git a/radiant/ui/modelselector/ModelSelector.h b/radiant/ui/modelselector/ModelSelector.h
@@ -153,7 +153,7 @@ class ModelSelector: public wxutil::DialogBase, private wxutil::XmlResourceBased
 	void onSkinsOrModelsReloaded();
 
 	void onModelLoaded(const model::ModelNodePtr& modelNode);
-
+    void onMaterialVisibilityStatusChanged();
 	void onMainFrameShuttingDown();
 
 protected: