Skip to content

Commit 7e0b813

Browse files
committed
Merge pull request godotengine#108523 from WhalesState/editor-files
Move last four 3D files to 3D folder and move physics gizmos to their own physics folder.
2 parents f0b4ebb + 5be915a commit 7e0b813

30 files changed

+22
-14
lines changed

editor/register_editor_types.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@
8686
#include "editor/scene/2d/skeleton_2d_editor_plugin.h"
8787
#include "editor/scene/2d/sprite_2d_editor_plugin.h"
8888
#include "editor/scene/2d/tiles/tiles_editor_plugin.h"
89+
#include "editor/scene/3d/bone_map_editor_plugin.h"
8990
#include "editor/scene/3d/camera_3d_editor_plugin.h"
91+
#include "editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h"
9092
#include "editor/scene/3d/lightmap_gi_editor_plugin.h"
9193
#include "editor/scene/3d/mesh_editor_plugin.h"
9294
#include "editor/scene/3d/mesh_instance_3d_editor_plugin.h"
@@ -100,9 +102,7 @@
100102
#include "editor/scene/3d/polygon_3d_editor_plugin.h"
101103
#include "editor/scene/3d/skeleton_3d_editor_plugin.h"
102104
#include "editor/scene/3d/voxel_gi_editor_plugin.h"
103-
#include "editor/scene/bone_map_editor_plugin.h"
104105
#include "editor/scene/curve_editor_plugin.h"
105-
#include "editor/scene/gpu_particles_collision_sdf_editor_plugin.h"
106106
#include "editor/scene/gradient_editor_plugin.h"
107107
#include "editor/scene/gui/control_editor_plugin.h"
108108
#include "editor/scene/gui/font_config_plugin.h"
File renamed without changes.

editor/scene/3d/gizmos/SCsub

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ from misc.utility.scons_hints import *
44
Import("env")
55

66
env.add_source_files(env.editor_sources, "*.cpp")
7+
8+
SConscript("physics/SCsub")
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env python
2+
from misc.utility.scons_hints import *
3+
4+
Import("env")
5+
6+
env.add_source_files(env.editor_sources, "*.cpp")

editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.cpp renamed to editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.cpp

File renamed without changes.

editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.h renamed to editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.h

File renamed without changes.

editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.cpp renamed to editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.cpp

File renamed without changes.

editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.h renamed to editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.h

File renamed without changes.

editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.cpp renamed to editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.cpp

File renamed without changes.

0 commit comments

Comments
 (0)