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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-14 20:48:43 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-14 20:48:43 +0400
commite0ca72735d586ba0abc380018bdc247199479f15 (patch)
treee893600dc556632f050f3585f7df599cbf962320 /intern/cycles/render/scene.h
parentadbd84c320d8b0781e97d09055f6cde4920b79f8 (diff)
Further fix for #34121: OSL + persistent images could crash in some cases still.
Diffstat (limited to 'intern/cycles/render/scene.h')
-rw-r--r--intern/cycles/render/scene.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index f6e1daea80d..fc6b538af03 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -125,7 +125,7 @@ public:
bool use_bvh_cache;
bool use_bvh_spatial_split;
bool use_qbvh;
- bool persistent_images;
+ bool persistent_data;
SceneParams()
{
@@ -146,7 +146,7 @@ public:
&& use_bvh_cache == params.use_bvh_cache
&& use_bvh_spatial_split == params.use_bvh_spatial_split
&& use_qbvh == params.use_qbvh
- && persistent_images == params.persistent_images); }
+ && persistent_data == params.persistent_data); }
};
/* Scene */