diff options
| author | hurikhan | 2015-01-14 13:31:16 +0800 |
|---|---|---|
| committer | hurikhan | 2015-01-14 13:31:16 +0800 |
| commit | 8a30feebbe676ab922515b58d0deec2f95aa104c (patch) | |
| tree | 55a208d7835022f6b876b4e45d5a482fbd4bd83f /scene/register_scene_types.cpp | |
| parent | 2203ba5fe3f7cdca078dd557ec532b7f335d3670 (diff) | |
| parent | 9012cd408e240d6039120e56fdd47a0983890993 (diff) | |
| download | godot-8a30feebbe676ab922515b58d0deec2f95aa104c.tar.gz godot-8a30feebbe676ab922515b58d0deec2f95aa104c.tar.zst godot-8a30feebbe676ab922515b58d0deec2f95aa104c.zip | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'scene/register_scene_types.cpp')
| -rw-r--r-- | scene/register_scene_types.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 259275127..8f28a3116 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -272,7 +272,7 @@ void register_scene_types() { ObjectTypeDB::register_type<Control>(); // ObjectTypeDB::register_type<EmptyControl>(); - ObjectTypeDB::add_compatibility_type("EmptyControl","control"); + ObjectTypeDB::add_compatibility_type("EmptyControl","Control"); ObjectTypeDB::register_type<Button>(); ObjectTypeDB::register_type<Label>(); ObjectTypeDB::register_type<HScrollBar>(); |