Cycles: svn merge -r41157:41182 ^/trunk/blender

[blender-staging.git] / source / blender / render / intern / source / pipeline.c

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index a3e4e7821fd5694e6ae31f6e76ac242c10d8e7cd..864707d70609f64b68e0fe1c9943b12138ff464d 100644 (file)
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -479,7 +479,7 @@ static void scene_unique_exr_name(Scene *scene, char *str, int sample)
        else
                BLI_snprintf(name, sizeof(name), "%s_%s%d.exr", fi, scene->id.name+2, sample);
 
-       BLI_make_file_string("/", str, btempdir, name);
+       BLI_make_file_string("/", str, BLI_temporary_dir(), name);
 }
 
 static void render_unique_exr_name(Render *re, char *str, int sample)