Commit: 0e87f42950a6ef2ea93cfeec5222e8efeceb4a95
Author: Bastien Montagne
Date: Fri Feb 14 12:54:17 2020 +0100
Branches: libquery-handle-ui-pointers
https://developer.blender.org/rB0e87f42950a6ef2ea93cfeec5222e8efeceb4a95
Merge branch 'master' into libquery-handle-ui-pointers
Conflicts:
source/blender/blenkernel/intern/lib_query.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/lib_query.c
index ee942049357,4b4d744c41a..7dd2e35ab06
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@@ -1179,16 -1035,13 +1182,18 @@@ static void library_foreach_ID_link(Mai
for (wmWindow *win = wm->windows.first; win; win = win->next) {
CALLBACK_INVOKE(win->scene, IDWALK_CB_USER_ONE);
- ID *workspace = (ID *)BKE_workspace_active_get(win->workspace_hook);
- CALLBACK_INVOKE_ID(workspace, IDWALK_CB_NOP);
- /* allow callback to set a different workspace */
- BKE_workspace_active_set(win->workspace_hook, (WorkSpace
*)workspace);
-
+ /* This pointer can be NULL during old files reading, better be
safe than sorry. */
+ if (win->workspace_hook != NULL) {
+ ID *workspace = (ID
*)BKE_workspace_active_get(win->workspace_hook);
+ CALLBACK_INVOKE_ID(workspace, IDWALK_CB_NOP);
+ /* allow callback to set a different workspace */
+ BKE_workspace_active_set(win->workspace_hook, (WorkSpace
*)workspace);
+ }
+ if (data.flag & IDWALK_INCLUDE_UI) {
+ for (ScrArea *area = win->global_areas.areabase.first; area; area
= area->next) {
+ library_foreach_screen_area(&data, area);
+ }
+ }
}
break;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
