[Bf-blender-cvs] [b787581c9cd] master: WM: don't set the area when toggling full-screen

Campbell Barton noreply at git.blender.org
Tue Mar 23 02:03:38 CET 2021


Commit: b787581c9cda5a0cd4bc8b03bbdd1f9832438db4
Author: Campbell Barton
Date:   Tue Mar 23 11:33:21 2021 +1100
Branches: master
https://developer.blender.org/rBb787581c9cda5a0cd4bc8b03bbdd1f9832438db4

WM: don't set the area when toggling full-screen

The stated reason for this no longer applies.

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

M	source/blender/editors/screen/screen_edit.c

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

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 3e498522071..7ad8eada3b9 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1413,8 +1413,8 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *area, const
     screen = screen_state_to_nonnormal(C, win, toggle_area, state);
   }
 
-  /* XXX bad code: setscreen() ends with first area active. fullscreen render assumes this too */
-  CTX_wm_area_set(C, screen->areabase.first);
+  BLI_assert(CTX_wm_screen(C) == screen);
+  BLI_assert(CTX_wm_area(C) == NULL); /* May have been freed. */
 
   return screen->areabase.first;
 }



More information about the Bf-blender-cvs mailing list