diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-03-22 14:58:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-03-22 14:58:42 -0300 |
| commit | 3aed92e5b145540aa4068d4a55b3521407af8e60 (patch) | |
| tree | c4f3faab4dfa0513d2b7009349ccc8c0909e10ae | |
| parent | c2d975582c7820f9fd17df1212c6e26c64e620c9 (diff) | |
| parent | e2c0caf41e8ae2c992c81ceed89a95a5c0d0cbfa (diff) | |
Merge pull request #1450 from theuserbl/master
Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
| -rw-r--r-- | core/global_constants.cpp | 1 | ||||
| -rw-r--r-- | scene/register_scene_types.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/global_constants.cpp b/core/global_constants.cpp index ae4abc627d..fc48a105db 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -313,6 +313,7 @@ static _GlobalConstant _global_constants[]={ BIND_GLOBAL_CONSTANT( KEY_MASK_ALT ), BIND_GLOBAL_CONSTANT( KEY_MASK_META ), BIND_GLOBAL_CONSTANT( KEY_MASK_CTRL ), + BIND_GLOBAL_CONSTANT( KEY_MASK_CMD ), BIND_GLOBAL_CONSTANT( KEY_MASK_KPAD ), BIND_GLOBAL_CONSTANT( KEY_MASK_GROUP_SWITCH ), diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index ac911ce63e..afadbf0170 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -77,6 +77,7 @@ #include "scene/gui/reference_frame.h" #include "scene/gui/graph_node.h" #include "scene/gui/graph_edit.h" +#include "scene/gui/tool_button.h" #include "scene/resources/video_stream.h" #include "scene/2d/particles_2d.h" #include "scene/2d/path_2d.h" @@ -292,6 +293,7 @@ void register_scene_types() { ObjectTypeDB::register_type<MenuButton>(); ObjectTypeDB::register_type<CheckBox>(); ObjectTypeDB::register_type<CheckButton>(); + ObjectTypeDB::register_type<ToolButton>(); ObjectTypeDB::register_type<Panel>(); ObjectTypeDB::register_type<Range>(); |