diff options
| author | James McLean <jrimclean@gmail.com> | 2015-06-21 23:15:58 -0400 |
|---|---|---|
| committer | James McLean <jrimclean@gmail.com> | 2015-06-21 23:15:58 -0400 |
| commit | 4e3ec18f7e0794900974f70de4e293838d48c9fe (patch) | |
| tree | 52048d583a1881a8056a6cd50aab2f6e833eb241 /scene/gui/control.cpp | |
| parent | 86c87ee66ab8601f081c89e8d85c75003b50ff78 (diff) | |
| parent | 37af8b413674936518a2ebe180f9e7bfcd5795bb (diff) | |
Merge branch 'master' of github.com:okamstudio/godot into development
Diffstat (limited to 'scene/gui/control.cpp')
| -rw-r--r-- | scene/gui/control.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 22559c238c..2367c03e99 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -548,15 +548,18 @@ void Control::_notification(int p_notification) { Control * parent = get_parent()->cast_to<Control>(); //make children reference them theme - if (parent && data.theme.is_null() && parent->data.theme_owner) + + if (parent && data.theme.is_null() && parent->data.theme_owner) { _propagate_theme_changed(parent->data.theme_owner); + } } break; case NOTIFICATION_UNPARENTED: { //make children unreference the theme - if (data.theme.is_null() && data.theme_owner) + if (data.theme.is_null() && data.theme_owner) { _propagate_theme_changed(NULL); + } } break; case NOTIFICATION_MOVED_IN_PARENT: { |