[Bf-blender-cvs] [52e1728a12] render-layers: Fix logic for bpy.context.scene_collection

[Dalai Felinto]

Commit: 52e1728a12ca65e506a0215f072eb3a6cbd19b59
Author: Dalai Felinto
Date:   Tue Jan 31 10:46:06 2017 +0100
Branches: render-layers
https://developer.blender.org/rB52e1728a12ca65e506a0215f072eb3a6cbd19b59

Fix logic for bpy.context.scene_collection

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

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

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

diff --git a/source/blender/blenkernel/intern/context.c 
b/source/blender/blenkernel/intern/context.c
index f079ec8f7b..dc56794f2a 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -951,8 +951,10 @@ SceneCollection *CTX_data_scene_collection(const bContext 
*C)
                        return sc;
                }
        }
-       else {
-               LayerCollection *lc = CTX_data_layer_collection(C);
+
+       LayerCollection *lc;
+       if (ctx_data_pointer_verify(C, "layer_collection", (void *)&lc)) {
+               lc = CTX_data_layer_collection(C);
                if (lc) {
                        return lc->scene_collection;
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs