diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-11 14:02:57 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-11 14:02:57 +0100 |
| commit | f040a351c2f27c6b86c40c71a28babf99dd0b9bd (patch) | |
| tree | b3e74218248f87b1dee7fcc51baad32c333a510d /scene/animation/animation_mixer.cpp | |
| parent | effb2708342e67666d5cfee544f62b000df0b77b (diff) | |
| parent | 6aac3e4a164457bfb08ff03d29313b84aedc607e (diff) | |
| download | redot-engine-f040a351c2f27c6b86c40c71a28babf99dd0b9bd.tar.gz | |
Merge pull request #89381 from aaronfranke/disable-3d
Disable all 3D nodes, physics, and resources when compiling without 3D
Diffstat (limited to 'scene/animation/animation_mixer.cpp')
| -rw-r--r-- | scene/animation/animation_mixer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp index 7db2b7201b..7080a5338b 100644 --- a/scene/animation/animation_mixer.cpp +++ b/scene/animation/animation_mixer.cpp @@ -33,14 +33,17 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/3d/node_3d.h" -#include "scene/3d/skeleton_3d.h" #include "scene/animation/animation_player.h" #include "scene/resources/animation.h" #include "scene/scene_string_names.h" #include "servers/audio/audio_stream.h" +#ifndef _3D_DISABLED +#include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/node_3d.h" +#include "scene/3d/skeleton_3d.h" +#endif // _3D_DISABLED + #ifdef TOOLS_ENABLED #include "editor/editor_node.h" #include "editor/editor_undo_redo_manager.h" |