瀏覽代碼

Merge pull request #1450 from theuserbl/master

Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
Juan Linietsky 10 年之前
父節點
當前提交
3aed92e5b1
共有 2 個文件被更改,包括 3 次插入0 次删除
  1. 1 0
      core/global_constants.cpp
  2. 2 0
      scene/register_scene_types.cpp

+ 1 - 0
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   ),
 

+ 2 - 0
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>();