godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61432 from Chaosus/fix_material_free_errors

Browse Source 
Fix errors when materials attached to 3d object are not freed
This commit is contained in:
Yuri Rubinsky 2022-05-26 22:07:30 +03:00 committed by GitHub
commit 6b9f6823c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene/3d/visual_instance_3d.cpp
View File

@ -496,3 +496,12 @@ void GeometryInstance3D::_bind_methods() {
GeometryInstance3D::GeometryInstance3D() { GeometryInstance3D::GeometryInstance3D() {
//RS::get_singleton()->instance_geometry_set_baked_light_texture_index(get_instance(),0); //RS::get_singleton()->instance_geometry_set_baked_light_texture_index(get_instance(),0);
} }
GeometryInstance3D::~GeometryInstance3D() {
if (material_overlay.is_valid()) {
set_material_overlay(Ref<Material>());
}
if (material_override.is_valid()) {
set_material_override(Ref<Material>());
}
}

1
scene/3d/visual_instance_3d.h
View File

@ -188,6 +188,7 @@ public:
TypedArray<String> get_configuration_warnings() const override; TypedArray<String> get_configuration_warnings() const override;
GeometryInstance3D(); GeometryInstance3D();
virtual ~GeometryInstance3D();
}; };
VARIANT_ENUM_CAST(GeometryInstance3D::ShadowCastingSetting); VARIANT_ENUM_CAST(GeometryInstance3D::ShadowCastingSetting);