From 525f2fe995d71f5321f19cd0e4076fcad526c5b5 Mon Sep 17 00:00:00 2001 From: theuserbl Date: Fri, 27 Feb 2015 11:09:57 +0100 Subject: [PATCH 1/2] Update register_scene_types.cpp Makes ToolButton usable for GDScript --- scene/register_scene_types.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index ff525203bfa..a1c4aaf8114 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -76,6 +76,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" @@ -288,6 +289,7 @@ void register_scene_types() { ObjectTypeDB::register_type(); ObjectTypeDB::register_type(); ObjectTypeDB::register_type(); + ObjectTypeDB::register_type(); ObjectTypeDB::register_type(); ObjectTypeDB::register_type(); From e2c0caf41e8ae2c992c81ceed89a95a5c0d0cbfa Mon Sep 17 00:00:00 2001 From: theuserbl Date: Fri, 27 Feb 2015 11:19:55 +0100 Subject: [PATCH 2/2] Update global_constants.cpp Making KEY_MASK_CMD usable in GDScript --- core/global_constants.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/core/global_constants.cpp b/core/global_constants.cpp index ae4abc627d3..fc48a105db0 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 ),