[Bf-blender-cvs] [143c869bd0] render-layers: Fix selected_objects iterator

[Dalai Felinto]

Commit: 143c869bd0cbefceccd757320f4fe84ac5e67be0
Author: Dalai Felinto
Date:   Tue Jan 10 15:09:55 2017 +0100
Branches: render-layers
https://developer.blender.org/rB143c869bd0cbefceccd757320f4fe84ac5e67be0

Fix selected_objects iterator

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

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

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

diff --git a/source/blender/blenkernel/intern/layer.c 
b/source/blender/blenkernel/intern/layer.c
index 5a15390025..326a239064 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -450,14 +450,20 @@ void BKE_selected_objects_Iterator_begin(Iterator *iter, 
void *data_in)
        SceneLayer *sl = data_in;
        ObjectBase *base = sl->object_bases.first;
 
+       /* when there are no objects */
+       if (base ==  NULL) {
+               iter->valid = false;
+               return;
+       }
+
        iter->valid = true;
+       iter->data = base;
 
        if ((base->flag & BASE_SELECTED) == 0) {
                BKE_selected_objects_Iterator_next(iter);
        }
        else {
                iter->current = base->object;
-               iter->data = base;
        }
 }

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