[Bf-blender-cvs] [fb47c131df5] master: Fix crash when open default template

Antonio Vazquez noreply at git.blender.org
Sat Feb 22 16:20:16 CET 2020


Commit: fb47c131df51c11e36555a649d89784ecf155c0b
Author: Antonio Vazquez
Date:   Sat Feb 22 16:20:08 2020 +0100
Branches: master
https://developer.blender.org/rBfb47c131df51c11e36555a649d89784ecf155c0b

Fix crash when open default template

As soon you select the default template, Blender crash on Winodws.

This was introduced in commit {0b626703}

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

M	source/blender/editors/interface/interface_region_popup.c

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

diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c
index dee462e929a..b72cc7296db 100644
--- a/source/blender/editors/interface/interface_region_popup.c
+++ b/source/blender/editors/interface/interface_region_popup.c
@@ -554,7 +554,7 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle)
   CTX_wm_region_set(C, ctx_ar);
 
   /* reset to region cursor (only if there's not another menu open) */
-  if (BLI_listbase_is_empty(&sc->regionbase)) {
+  if ((ctx_sa != NULL) && (BLI_listbase_is_empty(&sc->regionbase))) {
     ctx_sa->flag |= AREA_FLAG_CURSOR_UPDATE;
   }



More information about the Bf-blender-cvs mailing list