diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-03 11:11:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 11:11:18 +0200 |
| commit | 587c2608c03edf8fb7b44ec02a2d947b62f550c0 (patch) | |
| tree | 1f6c2991a45b9cedc6be4305feb2e64fa8c88354 | |
| parent | a25e52fb72dbf86e2af1787704ce6041e7b86799 (diff) | |
| parent | c2a2a1083d6f146fa039b68900b00e421e2fd4be (diff) | |
Merge pull request #29421 from JFonS/fix_meshlibrary_disable_3d
Remove MeshLibrary from disable_3d=true builds
| -rw-r--r-- | scene/register_scene_types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 5440c88fa8..8e6e8e2a53 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -144,7 +144,6 @@ #include "scene/resources/material.h" #include "scene/resources/mesh.h" #include "scene/resources/mesh_data_tool.h" -#include "scene/resources/mesh_library.h" #include "scene/resources/packed_scene.h" #include "scene/resources/particles_material.h" #include "scene/resources/physics_material.h" @@ -209,6 +208,7 @@ #include "scene/3d/visibility_notifier.h" #include "scene/animation/skeleton_ik.h" #include "scene/resources/environment.h" +#include "scene/resources/mesh_library.h" #endif static Ref<ResourceFormatSaverText> resource_saver_text; @@ -468,7 +468,7 @@ void register_scene_types() { OS::get_singleton()->yield(); //may take time to init #endif - ClassDB::register_class<MeshLibrary>(); + AcceptDialog::set_swap_ok_cancel(GLOBAL_DEF("gui/common/swap_ok_cancel", bool(OS::get_singleton()->get_swap_ok_cancel()))); ClassDB::register_class<Shader>(); |