diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-23 23:19:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 23:19:21 +0200 |
| commit | c529fa6987424f09fb4a1baf3814531a89e0dd64 (patch) | |
| tree | 1512f93d37f3caa536ba86bed0ec061673f49b3e | |
| parent | 8ef79ffe6838ae1710836f535884df296fe83d78 (diff) | |
| parent | 8f48eeaa8833066e050e15bb6978ed5beb051212 (diff) | |
Merge pull request #12316 from mrezai/fix-disable-3d
Fix disable_3d=yes compile errors
| -rw-r--r-- | scene/3d/SCsub | 3 | ||||
| -rw-r--r-- | scene/register_scene_types.cpp | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/scene/3d/SCsub b/scene/3d/SCsub index 72739b527e..4008f4f196 100644 --- a/scene/3d/SCsub +++ b/scene/3d/SCsub @@ -7,6 +7,9 @@ if env['disable_3d']: env.scene_sources.append("3d/spatial.cpp") env.scene_sources.append("3d/skeleton.cpp") + env.scene_sources.append("3d/particles.cpp") + env.scene_sources.append("3d/visual_instance.cpp") + env.scene_sources.append("3d/scenario_fx.cpp") else: env.add_source_files(env.scene_sources, "*.cpp") diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 75268aad1f..3bdfe097c9 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -152,6 +152,10 @@ #include "scene/resources/world_2d.h" #include "scene/scene_string_names.h" +#include "scene/3d/particles.h" +#include "scene/3d/scenario_fx.h" +#include "scene/3d/spatial.h" + #ifndef _3D_DISABLED #include "scene/3d/area.h" #include "scene/3d/arvr_nodes.h" @@ -169,7 +173,6 @@ #include "scene/3d/multimesh_instance.h" #include "scene/3d/navigation.h" #include "scene/3d/navigation_mesh.h" -#include "scene/3d/particles.h" #include "scene/3d/path.h" #include "scene/3d/physics_body.h" #include "scene/3d/physics_joint.h" @@ -180,9 +183,7 @@ #include "scene/3d/reflection_probe.h" #include "scene/3d/remote_transform.h" #include "scene/3d/room_instance.h" -#include "scene/3d/scenario_fx.h" #include "scene/3d/skeleton.h" -#include "scene/3d/spatial.h" #include "scene/3d/sprite_3d.h" #include "scene/3d/vehicle_body.h" #include "scene/3d/visibility_notifier.h" @@ -551,7 +552,9 @@ void register_scene_types() { ClassDB::register_class<AudioStreamPlayer>(); ClassDB::register_class<AudioStreamPlayer2D>(); +#ifndef _3D_DISABLED ClassDB::register_class<AudioStreamPlayer3D>(); +#endif ClassDB::register_virtual_class<VideoStream>(); ClassDB::register_class<AudioStreamSample>(); |