Bladeren bron

Merge pull request #108887 from WhalesState/spring-bone

Fix SpringBone3D being unintentionally disabled.
Thaddeus Crews 1 week geleden
bovenliggende
commit
7755a85c52

+ 0 - 0
editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.cpp → editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp


+ 0 - 0
editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.h → editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h


+ 1 - 1
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"

+ 5 - 5
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"