diff options
| author | Carl Olsson <carl.olsson@gmail.com> | 2015-02-16 05:08:47 +1000 |
|---|---|---|
| committer | Carl Olsson <carl.olsson@gmail.com> | 2015-02-16 05:08:47 +1000 |
| commit | b3dc4f855048f66301c058f96da23d9fe9641d38 (patch) | |
| tree | e17f1fed5962b24036b0f3634cbbd5d8ccfdd34e /scene/gui | |
| parent | e2c8aecb3d65cacb7695316257ecd0ec90c91871 (diff) | |
| parent | d7ea20c1664a23bb8606bff85028c01f3b123fde (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot into snapping2
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 4d32c7ea9a..a8070be91d 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2267,8 +2267,10 @@ void Control::_window_sort_subwindows() { if (!window->subwindow_order_dirty) return; + window->modal_stack.sort_custom<CComparator>(); window->subwindows.sort_custom<CComparator>(); + window->subwindow_order_dirty=false; } |