diff options
| author | Juan Linietsky <red@kyoko> | 2015-06-16 16:39:20 -0300 |
|---|---|---|
| committer | Juan Linietsky <red@kyoko> | 2015-06-16 16:39:20 -0300 |
| commit | 37af8b413674936518a2ebe180f9e7bfcd5795bb (patch) | |
| tree | da6993ed2cd087d93392c2c5542a70a078716fd2 /scene/gui/control.cpp | |
| parent | 669f5c994b5fe9fb870eae5db86b231202361617 (diff) | |
| parent | f2a29aadc620c2296e08ca20e926b54191c37540 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
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: { |