Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2018-01-30 18:05:43 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-01-30 18:07:08 +0300
commitdbed11d272a2ed6a430c1e26ebbdb566860dbcd1 (patch)
treef84052f43768b53e7f175b744f9b51d3156dad5e /source/blender/blenkernel/BKE_layer.h
parent0d64857c3f2364349475728958fac211b0bad5a2 (diff)
Fix FOREACH_OBJECT_RENDERABLE using stack data
Since 30a966a7262308 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.
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
-rw-r--r--source/blender/blenkernel/BKE_layer.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index b605b208f66..10026210d0c 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -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;