Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-17 16:20:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Free preview sun and environement on editor close.

Browse Source 
Previously, they would only be freed if they were in the editor node tree.
This commit is contained in:
clayjohn 2022-09-15 13:02:55 -07:00
parent c2babb6558
commit 969f20656a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -7645,6 +7645,7 @@ void Node3DEditor::_update_preview_environment() {
preview_sun->get_parent()->remove_child(preview_sun); preview_sun->get_parent()->remove_child(preview_sun);
sun_state->show(); sun_state->show();
sun_vb->hide(); sun_vb->hide();
preview_sun_dangling = true;
} }
if (directional_light_count > 0) { if (directional_light_count > 0) {
@ -7658,6 +7659,7 @@ void Node3DEditor::_update_preview_environment() {
add_child(preview_sun, true); add_child(preview_sun, true);
sun_state->hide(); sun_state->hide();
sun_vb->show(); sun_vb->show();
preview_sun_dangling = false;
} }
} }
@ -7673,6 +7675,7 @@ void Node3DEditor::_update_preview_environment() {
preview_environment->get_parent()->remove_child(preview_environment); preview_environment->get_parent()->remove_child(preview_environment);
environ_state->show(); environ_state->show();
environ_vb->hide(); environ_vb->hide();
preview_env_dangling = true;
} }
if (world_env_count > 0) { if (world_env_count > 0) {
environ_state->set_text(TTR("Scene contains\nWorldEnvironment.\nPreview disabled.")); environ_state->set_text(TTR("Scene contains\nWorldEnvironment.\nPreview disabled."));
@ -7685,6 +7688,7 @@ void Node3DEditor::_update_preview_environment() {
add_child(preview_environment); add_child(preview_environment);
environ_state->hide(); environ_state->hide();
environ_vb->show(); environ_vb->show();
preview_env_dangling = false;
} }
} }
} }
@ -7854,7 +7858,6 @@ Node3DEditor::Node3DEditor() {
sun_button->set_toggle_mode(true); sun_button->set_toggle_mode(true);
sun_button->set_flat(true); sun_button->set_flat(true);
sun_button->connect("pressed", callable_mp(this, &Node3DEditor::_update_preview_environment), CONNECT_DEFERRED); sun_button->connect("pressed", callable_mp(this, &Node3DEditor::_update_preview_environment), CONNECT_DEFERRED);
sun_button->set_disabled(true);
// Preview is enabled by default - ensure this applies on editor startup when there is no state yet. // Preview is enabled by default - ensure this applies on editor startup when there is no state yet.
sun_button->set_pressed(true); sun_button->set_pressed(true);
@ -7865,7 +7868,6 @@ Node3DEditor::Node3DEditor() {
environ_button->set_toggle_mode(true); environ_button->set_toggle_mode(true);
environ_button->set_flat(true); environ_button->set_flat(true);
environ_button->connect("pressed", callable_mp(this, &Node3DEditor::_update_preview_environment), CONNECT_DEFERRED); environ_button->connect("pressed", callable_mp(this, &Node3DEditor::_update_preview_environment), CONNECT_DEFERRED);
environ_button->set_disabled(true);
// Preview is enabled by default - ensure this applies on editor startup when there is no state yet. // Preview is enabled by default - ensure this applies on editor startup when there is no state yet.
environ_button->set_pressed(true); environ_button->set_pressed(true);
@ -8333,6 +8335,12 @@ void fragment() {
} }
Node3DEditor::~Node3DEditor() { Node3DEditor::~Node3DEditor() {
memdelete(preview_node); memdelete(preview_node);
if (preview_sun_dangling && preview_sun) {
memdelete(preview_sun);
}
if (preview_env_dangling && preview_environment) {
memdelete(preview_environment);
}
} }
void Node3DEditorPlugin::make_visible(bool p_visible) { void Node3DEditorPlugin::make_visible(bool p_visible) {

2
editor/plugins/node_3d_editor_plugin.h
View File

@ -763,7 +763,9 @@ private:
Button *sun_environ_settings = nullptr; Button *sun_environ_settings = nullptr;
DirectionalLight3D *preview_sun = nullptr; DirectionalLight3D *preview_sun = nullptr;
bool preview_sun_dangling = false;
WorldEnvironment *preview_environment = nullptr; WorldEnvironment *preview_environment = nullptr;
bool preview_env_dangling = false;
Ref<Environment> environment; Ref<Environment> environment;
Ref<CameraAttributesPhysical> camera_attributes; Ref<CameraAttributesPhysical> camera_attributes;
Ref<ProceduralSkyMaterial> sky_material; Ref<ProceduralSkyMaterial> sky_material;