diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-09-25 00:22:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-25 00:22:17 +0200 |
| commit | 632dbab226356eb4395ee2c0aa202c5fcd912e7d (patch) | |
| tree | 75d5fe40441b3146321ac46115e02895e326eb63 /editor | |
| parent | c9e75a7c3c63c40fd1794e24f58979e37e57b7de (diff) | |
| parent | 49ff3d5489e69c7009d40beb8d5f5c38d4a4988f (diff) | |
Merge pull request #66338 from asmaloney/some-include-cleanups
Remove unused includes & move some includes to top of file
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/import/resource_importer_scene.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h index 77bc06533c..386519bc59 100644 --- a/editor/import/resource_importer_scene.h +++ b/editor/import/resource_importer_scene.h @@ -35,11 +35,13 @@ #include "core/io/resource_importer.h" #include "core/variant/dictionary.h" #include "scene/3d/importer_mesh_instance_3d.h" -#include "scene/3d/node_3d.h" #include "scene/resources/animation.h" +#include "scene/resources/box_shape_3d.h" +#include "scene/resources/capsule_shape_3d.h" +#include "scene/resources/cylinder_shape_3d.h" #include "scene/resources/mesh.h" #include "scene/resources/shape_3d.h" -#include "scene/resources/skin.h" +#include "scene/resources/sphere_shape_3d.h" class Material; class AnimationPlayer; @@ -311,11 +313,6 @@ public: virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr) override; }; -#include "scene/resources/box_shape_3d.h" -#include "scene/resources/capsule_shape_3d.h" -#include "scene/resources/cylinder_shape_3d.h" -#include "scene/resources/sphere_shape_3d.h" - template <class M> Vector<Ref<Shape3D>> ResourceImporterScene::get_collision_shapes(const Ref<Mesh> &p_mesh, const M &p_options) { ShapeType generate_shape_type = SHAPE_TYPE_DECOMPOSE_CONVEX; |