[Bf-blender-cvs] [dda15a3e693] soc-2019-outliner: Outliner: Fix crash on duplicating scene

Nathan Craddock noreply at git.blender.org
Tue Jul 16 03:42:34 CEST 2019


Commit: dda15a3e69398f8a25fcb62cbec0875e6547b9e2
Author: Nathan Craddock
Date:   Mon Jul 15 19:41:06 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBdda15a3e69398f8a25fcb62cbec0875e6547b9e2

Outliner: Fix crash on duplicating scene

The function to determine if a collection was hidden was missing
a check to see if the layer collection was not null.

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

M	source/blender/blenkernel/intern/layer.c

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 0f1a02bc5ec..37b91f66aaa 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -515,7 +515,7 @@ static bool layer_collection_hidden(ViewLayer *view_layer, LayerCollection *lc)
     if (parent) {
       lc = BKE_layer_collection_first_from_scene_collection(view_layer, parent->collection);
 
-      return layer_collection_hidden(view_layer, lc);
+      return lc && layer_collection_hidden(view_layer, lc);
     }
     else {
       return false;



More information about the Bf-blender-cvs mailing list