[Bf-blender-cvs] [0c8a7069b5c] blender2.8: Fix assert opening file selector
Campbell Barton
noreply at git.blender.org
Wed Nov 28 06:22:58 CET 2018
Commit: 0c8a7069b5ce2970de5866f5543b0799e5c77ed0
Author: Campbell Barton
Date: Wed Nov 28 16:20:57 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB0c8a7069b5ce2970de5866f5543b0799e5c77ed0
Fix assert opening file selector
===================================================================
M source/blender/windowmanager/intern/wm_draw.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 654a3cf05b9..00364489af7 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -544,7 +544,9 @@ static void wm_draw_window_offscreen(bContext *C, wmWindow *win, bool stereo)
ED_area_update_region_sizes(wm, win, sa);
if (sa->flag & AREA_FLAG_ACTIVE_TOOL_UPDATE) {
- WM_toolsystem_update_from_context(C, CTX_wm_workspace(C), CTX_data_view_layer(C), sa);
+ if ((1 << sa->spacetype) & WM_TOOLSYSTEM_SPACE_MASK) {
+ WM_toolsystem_update_from_context(C, CTX_wm_workspace(C), CTX_data_view_layer(C), sa);
+ }
sa->flag &= ~AREA_FLAG_ACTIVE_TOOL_UPDATE;
}
More information about the Bf-blender-cvs
mailing list