archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix FOREACH_OBJECT_RENDERABLE recursion going over the roof

Browse Source 
This was leading to so much recursion that it was failing here.
How to test it: Open wanderer.blend and try to render (F12).

Note: This won't fix F12 rendering for wanderer with Eevee. Something else is
going wrong there.
This commit is contained in:
Dalai Felinto
2018-01-30 10:52:25 -02:00
parent e83cbf4610
commit 30a966a726
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/layer.c
View File

@@ -1992,6 +1992,9 @@ void BKE_renderable_objects_iterator_begin(BLI_Iterator *iter, void *data_in)
void BKE_renderable_objects_iterator_next(BLI_Iterator *iter)
{
/* Set it early in case we need to exit and we are running from within a loop. */
iter->skip = true;
ObjectsRenderableIteratorData *data = iter->data;
Base *base = data->iter.base->next;
@@ -2002,8 +2005,8 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter)
iter->current = ob;
data->iter.base = base;
if ((base->flag & BASE_VISIBLED) == 0) {
BKE_renderable_objects_iterator_next(iter);
if ((base->flag & BASE_VISIBLED) != 0) {
iter->skip = false;
}
return;
}
@@ -2016,8 +2019,6 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter)
Base base_iter = {(Base *)view_layer->object_bases.first, NULL};
data->iter.base = &base_iter;
BKE_renderable_objects_iterator_next(iter);
return;
}
}
@@ -2025,7 +2026,6 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter)
/* Setup the "set" for the next iteration. */
Scene scene = {.set = data->scene};
data->iter.set = &scene;
BKE_renderable_objects_iterator_next(iter);
return;
}
@@ -2035,8 +2035,6 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter)
Base base_iter = {(Base *)view_layer->object_bases.first, NULL};
data->iter.base = &base_iter;
BKE_renderable_objects_iterator_next(iter);
return;
}