Fix global static body memory leak

Author: aaronfranke

editor/viewport/editor_camera_settings_4d.cpp

@@ -82,7 +82,9 @@ void EditorCameraSettings4D::setup(Node *p_ancestor_of_cameras, Ref<ConfigFile>
 }
 
 void EditorCameraSettings4D::write_to_config_file() const {
-	_4d_editor_config_file->erase_section("camera");
+	if (_4d_editor_config_file->has_section("camera")) {
+		_4d_editor_config_file->erase_section("camera");
+	}
 	if (!Math::is_equal_approx(_clip_near, 0.05)) {
 		_4d_editor_config_file->set_value("camera", "clip_near", _clip_near);
 	}

editor/viewport/editor_main_screen_4d.cpp

@@ -165,9 +165,7 @@ void EditorMainScreen4D::_on_view_menu_id_pressed(const int p_id) {
 			_4d_editor_config_file->save(_4d_editor_config_file_path);
 		} break;
 		case VIEW_ITEM_CAMERA_SETTINGS: {
-#if GODOT_VERSION_MAJOR > 4 || (GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR >= 4)
 			_camera_settings_dialog->popup_centered(Size2(400, 300) * EDSCALE);
-#endif
 		} break;
 	}
 }
@@ -428,15 +426,15 @@ void EditorMainScreen4D::setup(EditorUndoRedoManager *p_undo_redo_manager) {
 
 	_camera_settings = memnew(EditorCameraSettings4D);
 	_camera_settings->setup(this, _4d_editor_config_file, _4d_editor_config_file_path);
-#if GODOT_VERSION_MAJOR > 4 || (GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR >= 4)
-	// Set up the camera settings dialog as long as this is Godot >= 4.4.
 	_camera_settings_dialog = memnew(ConfirmationDialog);
 	_camera_settings_dialog->set_name(StringName("CameraSettingsDialog"));
 	_camera_settings_dialog->set_title(TTR("Editor Camera Settings"));
 	_camera_settings_inspector = memnew(EditorInspector);
 	_camera_settings_inspector->set_name(StringName("CameraSettingsInspector"));
 	_camera_settings_inspector->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
 	_camera_settings_inspector->set_custom_minimum_size(Size2(400, 200) * EDSCALE);
+#if GODOT_MODULE || (GODOT_VERSION_MAJOR > 4 || (GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR >= 4))
+	// Set up the camera settings dialog as long as this is Godot >= 4.4.
 	_camera_settings_inspector->edit(_camera_settings);
 	_camera_settings_dialog->add_child(_camera_settings_inspector);
 	add_child(_camera_settings_dialog);
@@ -454,8 +452,10 @@ void EditorMainScreen4D::setup(EditorUndoRedoManager *p_undo_redo_manager) {
 }
 
 EditorMainScreen4D::~EditorMainScreen4D() {
-#if GODOT_VERSION_MAJOR > 4 || (GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR >= 4)
+#if GODOT_MODULE || (GODOT_VERSION_MAJOR > 4 || (GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR >= 4))
 	_camera_settings_inspector->edit(nullptr);
-	memdelete(_camera_settings);
 #endif
+	if (_camera_settings != nullptr) {
+		memdelete(_camera_settings);
+	}
 }

godot_4d_defines.h

@@ -40,8 +40,8 @@ using namespace godot;
 #define GODOT_VERSION_PATCH VERSION_PATCH
 #endif
 
-#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR < 5
-// Prior to Godot 4.5, the internal API of free_rid in RenderingServer and other servers did not match the exposed API.
+#if GODOT_VERSION_MAJOR == 4 && GODOT_VERSION_MINOR < 6
+// Prior to Godot 4.6, the internal API of free_rid in RenderingServer and other servers did not match the exposed API.
 // See https://github.com/godotengine/godot/pull/107139
 #define free_rid free
 #endif

physics/collision_shape_4d.cpp

@@ -1,36 +1,22 @@
 #include "collision_shape_4d.h"
 
 #include "bodies/collision_object_4d.h"
-#include "bodies/static_body_4d.h"
 #include "server/physics_server_4d.h"
 
-CollisionObject4D *CollisionShape4D::_global_static_body_for_bodyless_shapes = nullptr;
-
-CollisionObject4D *CollisionShape4D::_get_or_create_global_static_body() {
-	if (_global_static_body_for_bodyless_shapes != nullptr) {
-		return _global_static_body_for_bodyless_shapes;
-	}
-	StaticBody4D *global_static_body = memnew(StaticBody4D);
-	global_static_body->set_name("_GlobalStaticBody4D");
-	PhysicsServer4D::get_singleton()->register_physics_body(global_static_body);
-	_global_static_body_for_bodyless_shapes = global_static_body;
-	return _global_static_body_for_bodyless_shapes;
-}
-
 CollisionObject4D *CollisionShape4D::_get_ancestor_collision_object() const {
 	Node *parent = get_parent();
 	while (parent) {
 		Node4D *parent_4d = Object::cast_to<Node4D>(parent);
 		if (unlikely(!parent_4d)) {
-			return _get_or_create_global_static_body();
+			return PhysicsServer4D::get_or_create_global_static_body();
 		}
 		CollisionObject4D *co = Object::cast_to<CollisionObject4D>(parent);
 		if (likely(co)) {
 			return co;
 		}
 		parent = parent->get_parent();
 	}
-	return _get_or_create_global_static_body();
+	return PhysicsServer4D::get_or_create_global_static_body();
 }
 
 void CollisionShape4D::_notification(int p_what) {

physics/collision_shape_4d.h

@@ -10,6 +10,7 @@
 #endif
 
 class CollisionObject4D;
+class PhysicsServer4D;
 
 class CollisionShape4D : public Node4D {
 	GDCLASS(CollisionShape4D, Node4D);
@@ -20,8 +21,6 @@ class CollisionShape4D : public Node4D {
 	uint32_t _collision_layer = 1;
 	uint32_t _collision_mask = 1;
 
-	static CollisionObject4D *_global_static_body_for_bodyless_shapes;
-	static CollisionObject4D *_get_or_create_global_static_body();
 	CollisionObject4D *_get_ancestor_collision_object() const;
 
 protected:

physics/server/physics_server_4d.cpp

@@ -1,5 +1,7 @@
 #include "physics_server_4d.h"
 
+#include "../bodies/static_body_4d.h"
+
 #if GDEXTENSION
 #include <godot_cpp/classes/scene_tree.hpp>
 #include <godot_cpp/classes/window.hpp>
@@ -145,7 +147,27 @@ TypedArray<PhysicsBody4D> PhysicsServer4D::get_physics_body_nodes() const {
 	return _physics_body_nodes;
 }
 
-PhysicsServer4D *PhysicsServer4D::singleton = nullptr;
+CollisionObject4D *PhysicsServer4D::get_or_create_global_static_body() {
+	if (_global_static_body_for_bodyless_shapes != nullptr) {
+		return _global_static_body_for_bodyless_shapes;
+	}
+	StaticBody4D *global_static_body = memnew(StaticBody4D);
+	global_static_body->set_name("_GlobalStaticBody4D");
+	PhysicsServer4D::get_singleton()->register_physics_body(global_static_body);
+	_global_static_body_for_bodyless_shapes = global_static_body;
+	return _global_static_body_for_bodyless_shapes;
+}
+
+CollisionObject4D *PhysicsServer4D::_global_static_body_for_bodyless_shapes = nullptr;
+PhysicsServer4D *PhysicsServer4D::_singleton = nullptr;
+
+PhysicsServer4D::~PhysicsServer4D() {
+	_singleton = nullptr;
+	if (_global_static_body_for_bodyless_shapes != nullptr) {
+		memdelete(_global_static_body_for_bodyless_shapes);
+		_global_static_body_for_bodyless_shapes = nullptr;
+	}
+}
 
 void PhysicsServer4D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("register_physics_engine", "name", "engine"), &PhysicsServer4D::register_physics_engine);

physics/server/physics_server_4d.h

@@ -35,7 +35,8 @@ class PhysicsServer4D : public Object {
 	void _physics_process();
 
 protected:
-	static PhysicsServer4D *singleton;
+	static CollisionObject4D *_global_static_body_for_bodyless_shapes;
+	static PhysicsServer4D *_singleton;
 	static void _bind_methods();
 
 public:
@@ -62,7 +63,8 @@ class PhysicsServer4D : public Object {
 	TypedArray<Area4D> get_area_nodes() const;
 	TypedArray<PhysicsBody4D> get_physics_body_nodes() const;
 
-	static PhysicsServer4D *get_singleton() { return singleton; }
-	PhysicsServer4D() { singleton = this; }
-	~PhysicsServer4D() { singleton = nullptr; }
+	static CollisionObject4D *get_or_create_global_static_body();
+	static PhysicsServer4D *get_singleton() { return _singleton; }
+	PhysicsServer4D() { _singleton = this; }
+	~PhysicsServer4D();
 };