Browse Source

Merge pull request #70110 from Chaosus/fix_inspector_instance_uniform

Fix undefined
Yuri Rubinsky 2 years ago
parent
commit
fac614cdea
1 changed files with 7 additions and 0 deletions
  1. 7 0
      scene/3d/visual_instance_3d.cpp

+ 7 - 0
scene/3d/visual_instance_3d.cpp

@@ -30,6 +30,7 @@
 
 #include "visual_instance_3d.h"
 
+#include "core/core_string_names.h"
 #include "scene/scene_string_names.h"
 
 AABB VisualInstance3D::get_aabb() const {
@@ -134,7 +135,13 @@ VisualInstance3D::~VisualInstance3D() {
 }
 
 void GeometryInstance3D::set_material_override(const Ref<Material> &p_material) {
+	if (material_override.is_valid()) {
+		material_override->disconnect(CoreStringNames::get_singleton()->property_list_changed, callable_mp((Object *)this, &Object::notify_property_list_changed));
+	}
 	material_override = p_material;
+	if (material_override.is_valid()) {
+		material_override->connect(CoreStringNames::get_singleton()->property_list_changed, callable_mp((Object *)this, &Object::notify_property_list_changed));
+	}
 	RS::get_singleton()->instance_geometry_set_material_override(get_instance(), p_material.is_valid() ? p_material->get_rid() : RID());
 }