diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-10-24 08:31:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-24 08:31:15 +0200 |
commit | b67ccf1a6f326c5d4d5fa1cc7cd15eff3573f8f7 (patch) | |
tree | 4f79289028eef459304355cf1c14c4d1e62ccab5 /scene | |
parent | 11f362b510ba7feaab116ff39c1d0b1c7bf9da6f (diff) | |
parent | 961ee3a1d7c15731c4e5dbb731fb01a509a78078 (diff) |
Merge pull request #43046 from aaronfranke/button-group
Rename button group property to button_group
Diffstat (limited to 'scene')
-rw-r--r-- | scene/gui/base_button.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index a759e329da..1a19c75d27 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -401,7 +401,7 @@ void BaseButton::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "button_mask", PROPERTY_HINT_FLAGS, "Mouse Left, Mouse Right, Mouse Middle"), "set_button_mask", "get_button_mask"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "keep_pressed_outside"), "set_keep_pressed_outside", "is_keep_pressed_outside"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut", PROPERTY_HINT_RESOURCE_TYPE, "Shortcut"), "set_shortcut", "get_shortcut"); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "group", PROPERTY_HINT_RESOURCE_TYPE, "ButtonGroup"), "set_button_group", "get_button_group"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "button_group", PROPERTY_HINT_RESOURCE_TYPE, "ButtonGroup"), "set_button_group", "get_button_group"); BIND_ENUM_CONSTANT(DRAW_NORMAL); BIND_ENUM_CONSTANT(DRAW_PRESSED); |