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.cpp
parentadbd84c320d8b0781e97d09055f6cde4920b79f8 (diff)
Further fix for #34121: OSL + persistent images could crash in some cases still.
Diffstat (limited to 'intern/cycles/render/scene.cpp')
-rw-r--r--intern/cycles/render/scene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index a1fcffa94a4..7b82a91cae8 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -106,7 +106,7 @@ void Scene::free_memory(bool final)
particle_system_manager->device_free(device, &dscene);
curve_system_manager->device_free(device, &dscene);
- if(!params.persistent_images || final)
+ if(!params.persistent_data || final)
image_manager->device_free(device, &dscene);
}