[Bf-blender-cvs] [b272b72] master: Removed ad-hoc use of R_PERSISTENT_DATA for Freestyle/Cycles.

[Tamito Kajiyama]

Commit: b272b729ce4c5d389c453b143c3220fce26e2cbc
Author: Tamito Kajiyama
Date:   Fri Jun 27 14:55:18 2014 +0900
Branches: master
https://developer.blender.org/rBb272b729ce4c5d389c453b143c3220fce26e2cbc

Removed ad-hoc use of R_PERSISTENT_DATA for Freestyle/Cycles.

===================================================================

M	source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp

===================================================================

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index a047fb1..18989a9 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -80,7 +80,6 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(bContext *C, Render *re, int render
 	freestyle_scene->r.cfra = old_scene->r.cfra;
 	freestyle_scene->r.mode = old_scene->r.mode &
 	                          ~(R_EDGE_FRS | R_SHADOW | R_SSS | R_PANORAMA | R_ENVMAP | R_MBLUR | R_BORDER);
-	freestyle_scene->r.mode |= R_PERSISTENT_DATA; // for nested Cycles sessions
 	freestyle_scene->r.xsch = re->rectx; // old_scene->r.xsch
 	freestyle_scene->r.ysch = re->recty; // old_scene->r.ysch
 	freestyle_scene->r.xasp = 1.0f; // old_scene->r.xasp;