blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix FOREACH_OBJECT_RENDERABLE going over the same object twice 

Which is really silly because we were already tagging the ids, but simply
never checking them back.
This commit is contained in:
Dalai Felinto 2018-01-30 11:23:50 -02:00
parent 30a966a726
commit b5cbc8bb60
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1970,10 +1970,11 @@ void BKE_renderable_objects_iterator_begin(BLI_Iterator *iter, void *data_in)
{
ObjectsRenderableIteratorData *data = data_in;
/* Tag objects to prevent going over the same object twice. */
for (Scene *scene = data->scene; scene; scene = scene->set) {
for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
for (Base *base = view_layer->object_bases.first; base; base = base->next) {
base->object->id.flag |= LIB_TAG_DOIT;
base->object->id.flag |= LIB_TAG_DOIT;
}
}
}
@ -2002,11 +2003,17 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter)
if (base != NULL) {
Object *ob = base->object;
iter->current = ob;
/* We need to set the iter.base even if the rest fail otherwise
* we keep checking the exactly same base over and over again. */
data->iter.base = base;
if ((base->flag & BASE_VISIBLED) != 0) {
iter->skip = false;
if (ob->id.flag & LIB_TAG_DOIT) {
ob->id.flag &= ~LIB_TAG_DOIT;
if ((base->flag & BASE_VISIBLED) != 0) {
iter->skip = false;
iter->current = ob;
}
}
return;
}