From 11c2d4fb3998d86a3be9537bcb6f38f96f7befe8 Mon Sep 17 00:00:00 2001
From: Mounir Tohami <53877170+WhalesState@users.noreply.github.com>
Date: Wed, 23 Jul 2025 00:47:51 +0300
Subject: [PATCH] fix spring bone 3d being disabled with 3d physics

---
 .../{physics => }/spring_bone_3d_gizmo_plugin.cpp      |  0
 .../gizmos/{physics => }/spring_bone_3d_gizmo_plugin.h |  0
 editor/scene/3d/node_3d_editor_plugin.cpp              |  2 +-
 scene/register_scene_types.cpp                         | 10 +++++-----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename editor/scene/3d/gizmos/{physics => }/spring_bone_3d_gizmo_plugin.cpp (100%)
 rename editor/scene/3d/gizmos/{physics => }/spring_bone_3d_gizmo_plugin.h (100%)

diff --git a/editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/node_3d_editor_plugin.cpp b/editor/scene/3d/node_3d_editor_plugin.cpp
index 7e6995d4fd2..1fedcd1ab93 100644
--- a/editor/scene/3d/node_3d_editor_plugin.cpp
+++ b/editor/scene/3d/node_3d_editor_plugin.cpp
@@ -71,9 +71,9 @@
 #include "editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.h"
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 892fa0e30bf..d288aa5e13f 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -245,6 +245,11 @@
 #include "scene/3d/retarget_modifier_3d.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/3d/skeleton_modifier_3d.h"
+#include "scene/3d/spring_bone_collision_3d.h"
+#include "scene/3d/spring_bone_collision_capsule_3d.h"
+#include "scene/3d/spring_bone_collision_plane_3d.h"
+#include "scene/3d/spring_bone_collision_sphere_3d.h"
+#include "scene/3d/spring_bone_simulator_3d.h"
 #include "scene/3d/sprite_3d.h"
 #include "scene/3d/visible_on_screen_notifier_3d.h"
 #include "scene/3d/voxel_gi.h"
@@ -333,11 +338,6 @@
 #include "scene/3d/physics/spring_arm_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
 #include "scene/3d/physics/vehicle_body_3d.h"
-#include "scene/3d/spring_bone_collision_3d.h"
-#include "scene/3d/spring_bone_collision_capsule_3d.h"
-#include "scene/3d/spring_bone_collision_plane_3d.h"
-#include "scene/3d/spring_bone_collision_sphere_3d.h"
-#include "scene/3d/spring_bone_simulator_3d.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"