[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52150] branches/soc-2008-mxcurioni/source /blender/makesdna/DNA_scene_types.h: Fix conflict of cycles persistent data flag with freestyle.

[Brecht Van Lommel]

Revision: 52150
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52150
Author:   blendix
Date:     2012-11-12 14:25:46 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
Fix conflict of cycles persistent data flag with freestyle.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h

Modified: branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h	2012-11-12 14:25:29 UTC (rev 52149)
+++ branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h	2012-11-12 14:25:46 UTC (rev 52150)
@@ -1201,8 +1201,8 @@
 #define R_NO_OVERWRITE		0x400000  /* skip existing files */
 #define R_TOUCH				0x800000  /* touch files before rendering */
 #define R_SIMPLIFY			0x1000000
-#define R_PERSISTENT_DATA	0x2000000 /* keep data around for re-render */
-#define R_EDGE_FRS		0x2000000 /* R_EDGE for Freestyle */
+#define R_EDGE_FRS			0x2000000 /* R_EDGE for Freestyle */
+#define R_PERSISTENT_DATA	0x4000000 /* keep data around for re-render */
 
 /* seq_flag */
 #define R_SEQ_GL_PREV 1