diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 17:24:16 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 17:24:16 -0300 |
commit | dc7ac86b798f40e1472871391af49a562879eadc (patch) | |
tree | 0cae39a004458c5a62cc14888a35f53e88aa42a1 /scene | |
parent | 0e1d70f637c31aa107f109a2e21ec9cd5e82d047 (diff) |
-Completely removed EmptyControl (but added fallback), closes #1017
Diffstat (limited to 'scene')
-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 ee6b481a9f..cf49979118 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -39,7 +39,6 @@ #include "scene/main/viewport.h" #include "scene/gui/control.h" #include "scene/gui/texture_progress.h" -#include "scene/gui/empty_control.h" #include "scene/gui/button.h" #include "scene/gui/button_array.h" #include "scene/gui/button_group.h" @@ -272,7 +271,8 @@ void register_scene_types() { OS::get_singleton()->yield(); //may take time to init ObjectTypeDB::register_type<Control>(); - ObjectTypeDB::register_type<EmptyControl>(); +// ObjectTypeDB::register_type<EmptyControl>(); + ObjectTypeDB::add_compatibility_type("EmptyControl","control"); ObjectTypeDB::register_type<Button>(); ObjectTypeDB::register_type<Label>(); ObjectTypeDB::register_type<HScrollBar>(); |