Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-01-31 12:46:06 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-01-31 12:46:06 +0300
commit52e1728a12ca65e506a0215f072eb3a6cbd19b59 (patch)
treeec7ec0e826740bee48df02d38117d3a55fdd24bb
parent910f16576d71f9a3fc9db4c66b573bfa84baf8b9 (diff)
Fix logic for bpy.context.scene_collection
-rw-r--r--source/blender/blenkernel/intern/context.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index f079ec8f7bd..dc56794f2a4 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;
}