[Bf-blender-cvs] [aa44b77129] blender2.8: Fix T50841: Scene object iterator did not get data from LinkData for the master collection

[Sergey Sharybin]

Commit: aa44b771299801f1b213bf89b84c733809823857
Author: Sergey Sharybin
Date:   Mon Mar 6 17:55:11 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBaa44b771299801f1b213bf89b84c733809823857

Fix T50841: Scene object iterator did not get data from LinkData for the master collection

Debug session with Dalai Felinto.

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

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

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

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index eac0fc7a2f..b423efdda2 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) {