Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / screen / area.c
index 08d92dfc9ff1363ca515d85a77d1c854a25dba37..e097cd34eac4575f166f4e04c7afce7a59ceec81 100644 (file)
@@ -769,6 +769,10 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea
                return;
        }
 
+       if (U.uiflag & USER_LOCK_UI_LAYOUT) {
+               return;
+       }
+
        /* can't click on bottom corners on OS X, already used for resizing */
 #ifdef __APPLE__
        if (!(sa->totrct.xmin == 0 && sa->totrct.ymin == 0) || WM_window_is_fullscreen(win))