Skip to content

Commit 7755a85

Browse files
committed
Merge pull request #108887 from WhalesState/spring-bone
Fix SpringBone3D being unintentionally disabled.
2 parents 9471a4a + 11c2d4f commit 7755a85

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

editor/scene/3d/node_3d_editor_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
#include "editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.h"
7272
#include "editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.h"
7373
#include "editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.h"
74-
#include "editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.h"
7574
#include "editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.h"
7675
#include "editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.h"
76+
#include "editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h"
7777
#include "editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.h"
7878
#include "editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h"
7979
#include "editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.h"

scene/register_scene_types.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,11 @@
245245
#include "scene/3d/retarget_modifier_3d.h"
246246
#include "scene/3d/skeleton_3d.h"
247247
#include "scene/3d/skeleton_modifier_3d.h"
248+
#include "scene/3d/spring_bone_collision_3d.h"
249+
#include "scene/3d/spring_bone_collision_capsule_3d.h"
250+
#include "scene/3d/spring_bone_collision_plane_3d.h"
251+
#include "scene/3d/spring_bone_collision_sphere_3d.h"
252+
#include "scene/3d/spring_bone_simulator_3d.h"
248253
#include "scene/3d/sprite_3d.h"
249254
#include "scene/3d/visible_on_screen_notifier_3d.h"
250255
#include "scene/3d/voxel_gi.h"
@@ -333,11 +338,6 @@
333338
#include "scene/3d/physics/spring_arm_3d.h"
334339
#include "scene/3d/physics/static_body_3d.h"
335340
#include "scene/3d/physics/vehicle_body_3d.h"
336-
#include "scene/3d/spring_bone_collision_3d.h"
337-
#include "scene/3d/spring_bone_collision_capsule_3d.h"
338-
#include "scene/3d/spring_bone_collision_plane_3d.h"
339-
#include "scene/3d/spring_bone_collision_sphere_3d.h"
340-
#include "scene/3d/spring_bone_simulator_3d.h"
341341
#include "scene/resources/3d/box_shape_3d.h"
342342
#include "scene/resources/3d/capsule_shape_3d.h"
343343
#include "scene/resources/3d/concave_polygon_shape_3d.h"

0 commit comments

Comments
 (0)