sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Correction to last commit

Browse Source 
Did a fullscreen check in a function that should only be called in fullscreen mode. Not a big deal, but bad API practice.
This commit is contained in:
Julian Eisel 2015-09-10 20:23:17 +02:00
parent 487705d60a
commit d234bf21b9
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/screen/screen_edit.c
View File

@ -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);
}
}

8
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -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);