|
@@ -30,6 +30,7 @@
|
|
|
|
|
|
#include "visual_instance_3d.h"
|
|
#include "visual_instance_3d.h"
|
|
|
|
|
|
|
|
+#include "core/core_string_names.h"
|
|
#include "scene/scene_string_names.h"
|
|
#include "scene/scene_string_names.h"
|
|
|
|
|
|
AABB VisualInstance3D::get_aabb() const {
|
|
AABB VisualInstance3D::get_aabb() const {
|
|
@@ -134,7 +135,13 @@ VisualInstance3D::~VisualInstance3D() {
|
|
}
|
|
}
|
|
|
|
|
|
void GeometryInstance3D::set_material_override(const Ref<Material> &p_material) {
|
|
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;
|
|
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());
|
|
RS::get_singleton()->instance_geometry_set_material_override(get_instance(), p_material.is_valid() ? p_material->get_rid() : RID());
|
|
}
|
|
}
|
|
|
|
|