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
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-14 20:11:47 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-14 20:11:47 +0400
commitadbd84c320d8b0781e97d09055f6cde4920b79f8 (patch)
tree4df5496bd2d96a0115aa45526555097f73caad3c /source
parenta47af30561ea9b0b2933a4af202a560b3576ee11 (diff)
Fix #34121: OSL + persistent images option was not freeing shader memory properly,
causing memory to increase continuously during animation render.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/render/render_preview.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 33b00cbf2ea..dfc80e4cf51 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -362,7 +362,7 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre
}
else {
/* use current scene world to light sphere */
- if (ma->pr_type == MA_SPHERE_A)
+ if (mat->pr_type == MA_SPHERE_A)
sce->world = scene->world;
}