[Bf-blender-cvs] [5a144c797a3] master: Fix T63816: Crash opening file with multiple view layers

Sergey Sharybin noreply at git.blender.org
Tue Apr 23 14:32:24 CEST 2019


Commit: 5a144c797a3b5385b0a85027d4bfbf2c3b7ee69d
Author: Sergey Sharybin
Date:   Tue Apr 23 14:31:21 2019 +0200
Branches: master
https://developer.blender.org/rB5a144c797a3b5385b0a85027d4bfbf2c3b7ee69d

Fix T63816: Crash opening file with multiple view layers

Dependency graph will not be crated for view layers which were never visible.

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 984b52465b5..fc66d52c4ef 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -986,6 +986,9 @@ void DRW_cache_free_old_batches(Main *bmain)
   for (scene = bmain->scenes.first; scene; scene = scene->id.next) {
     for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
       Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false);
+      if (depsgraph == NULL) {
+        continue;
+      }
 
       /* TODO(fclem): This is not optimal since it iter over all dupli instances.
        * In this case only the source object should be tagged. */



More information about the Bf-blender-cvs mailing list