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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-03-06 19:55:11 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-03-06 19:56:19 +0300
commitaa44b771299801f1b213bf89b84c733809823857 (patch)
treea0ee02018df2375e401e0a63254cdd05112a5de2 /source/blender/blenkernel/intern/collection.c
parenta5cba9aab9a2ade00caefc1a7697f8fbd3f7304f (diff)
Fix T50841: Scene object iterator did not get data from LinkData for the master collection
Debug session with Dalai Felinto.
Diffstat (limited to 'source/blender/blenkernel/intern/collection.c')
-rw-r--r--source/blender/blenkernel/intern/collection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index eac0fc7a2fd..b423efdda24 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -429,7 +429,7 @@ void BKE_scene_objects_Iterator_begin(Iterator *iter, void *data_in)
BKE_scene_collections_Iterator_begin(&data->scene_collection_iter, scene);
SceneCollection *sc = data->scene_collection_iter.current;
- iter->current = sc->objects.first;
+ iter->current = sc->objects.first ? ((LinkData *)sc->objects.first)->data : NULL;
iter->valid = true;
if (iter->current == NULL) {