blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix FOREACH_OBJECT_RENDERABLE using stack data 

Since 30a966a726 when I removed the recursion, the code was still relying
on stack data. This would crash in release often, and it should crash always.

Big thanks to Sergey Sharybin for spotting the issue.
This commit is contained in:
Dalai Felinto 2018-01-30 13:05:43 -02:00
parent 0d64857c3f
commit dbed11d272
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_layer.h
View File

@ -29,6 +29,8 @@
#include "BKE_collection.h"
#include "DNA_scene_types.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -263,6 +265,8 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter);
typedef struct ObjectsRenderableIteratorData {
struct Scene *scene;
struct Base base_temp;
struct Scene scene_temp;
struct {
struct ViewLayer *view_layer;

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

@ -1982,8 +1982,8 @@ void BKE_renderable_objects_iterator_begin(BLI_Iterator *iter, void *data_in)
ViewLayer *view_layer = data->scene->view_layers.first;
data->iter.view_layer = view_layer;
Base base = {(Base *)view_layer->object_bases.first, NULL};
data->iter.base = &base;
data->base_temp.next = view_layer->object_bases.first;
data->iter.base = &data->base_temp;
data->iter.set = NULL;
@ -2023,25 +2023,23 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter)
while ((data->iter.view_layer = data->iter.view_layer->next)) {
ViewLayer *view_layer = data->iter.view_layer;
if (view_layer->flag & VIEW_LAYER_RENDER) {
Base base_iter = {(Base *)view_layer->object_bases.first, NULL};
data->iter.base = &base_iter;
data->base_temp.next = view_layer->object_bases.first;
data->iter.base = &data->base_temp;
return;
}
}
/* Setup the "set" for the next iteration. */
Scene scene = {.set = data->scene};
data->iter.set = &scene;
data->scene_temp.set = data->scene;
data->iter.set = &data->scene_temp;
return;
}
/* Look for an object in the next set. */
while ((data->iter.set = data->iter.set->set)) {
ViewLayer *view_layer = BKE_view_layer_from_scene_get(data->iter.set);
Base base_iter = {(Base *)view_layer->object_bases.first, NULL};
data->iter.base = &base_iter;
data->base_temp.next = view_layer->object_bases.first;
data->iter.base = &data->base_temp;
return;
}