[Bf-blender-cvs] [d234bf2] master: Correction to last commit

[Julian Eisel]

Commit: d234bf21b97c4e31b963a18eb71012634b014b6f
Author: Julian Eisel
Date:   Thu Sep 10 20:23:17 2015 +0200
Branches: master
https://developer.blender.org/rBd234bf21b97c4e31b963a18eb71012634b014b6f

Correction to last commit

Did a fullscreen check in a function that should only be called in fullscreen 
mode. Not a big deal, but bad API practice.

===================================================================

M       source/blender/editors/screen/screen_edit.c
M       source/blender/windowmanager/intern/wm_event_system.c

===================================================================

diff --git a/source/blender/editors/screen/screen_edit.c 
b/source/blender/editors/screen/screen_edit.c
index 37b4603..569d611 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1791,6 +1791,8 @@ ScrArea *ED_screen_full_newspace(bContext *C, ScrArea 
*sa, int type)
  */
 void ED_screen_full_prevspace(bContext *C, ScrArea *sa, const bool 
was_prev_temp)
 {
+       BLI_assert(sa->full);
+
        if (sa->flag & AREA_FLAG_STACKED_FULLSCREEN) {
                /* stacked fullscreen -> only go back to previous screen and 
don't toggle out of fullscreen */
                ED_area_prevspace(C, sa);
@@ -1800,12 +1802,7 @@ void ED_screen_full_prevspace(bContext *C, ScrArea *sa, 
const bool was_prev_temp
                }
        }
        else {
-               if (sa->full) {
-                       ED_screen_restore_temp_type(C, sa);
-               }
-               else {
-                       ED_area_prevspace(C, sa);
-               }
+               ED_screen_restore_temp_type(C, sa);
        }
 }
 
diff --git a/source/blender/windowmanager/intern/wm_event_system.c 
b/source/blender/windowmanager/intern/wm_event_system.c
index ff67758..187c11e 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1801,7 +1801,13 @@ static int wm_handler_fileselect_do(bContext *C, 
ListBase *handlers, wmEventHand
                                const SpaceLink *sl = sa->spacedata.first;
                                const bool was_prev_temp = (sl->next && 
sl->next->spacetype == SPACE_IMAGE);
 
-                               ED_screen_full_prevspace(C, sa, was_prev_temp);
+                               if (sa->full) {
+                                       ED_screen_full_prevspace(C, sa, 
was_prev_temp);
+                               }
+                               /* user may have left fullscreen */
+                               else {
+                                       ED_area_prevspace(C, sa);
+                               }
                        }
 
                        wm_handler_op_context(C, handler, 
CTX_wm_window(C)->eventstate);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs