diff options
| author | Rémi Verschelde | 2017-02-07 14:16:47 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-07 14:16:47 +0100 |
| commit | be0350704fa36bce8207c7c72ef2b64e5c8017ee (patch) | |
| tree | 97ddb06a7fd732d9b32ac71eea14f3c41cf2d616 /scene/register_scene_types.cpp | |
| parent | 34b6caa43303c46f178e0375aa50bfaf5ac903e7 (diff) | |
| parent | f3bc5d443cac02be8eac458f467bd3c8d41b0345 (diff) | |
| download | godot-be0350704fa36bce8207c7c72ef2b64e5c8017ee.tar.gz godot-be0350704fa36bce8207c7c72ef2b64e5c8017ee.tar.zst godot-be0350704fa36bce8207c7c72ef2b64e5c8017ee.zip | |
Merge pull request #7711 from williamd1k0/cherrypick-colorframe
Add ColorFrame control (2.1)
Diffstat (limited to 'scene/register_scene_types.cpp')
| -rw-r--r-- | scene/register_scene_types.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 76a697c14..0dda56946 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -55,6 +55,7 @@ #include "scene/gui/option_button.h" #include "scene/gui/color_picker.h" #include "scene/gui/texture_frame.h" +#include "scene/gui/color_rect.h" #include "scene/gui/patch_9_frame.h" #include "scene/gui/menu_button.h" #include "scene/gui/check_box.h" @@ -338,6 +339,7 @@ void register_scene_types() { OS::get_singleton()->yield(); //may take time to init ObjectTypeDB::register_type<TextureFrame>(); + ObjectTypeDB::register_type<ColorFrame>(); ObjectTypeDB::register_type<Patch9Frame>(); ObjectTypeDB::register_type<TabContainer>(); ObjectTypeDB::register_type<Tabs>(); |