Merged changes in the trunk up to revision 52191.

[blender-staging.git] / source / blender / makesdna / DNA_scene_types.h

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 248faf5a242da1481dce2bce94404a3f8c717f95..3e22613574188becdfda1fc723390caec1843ed2 100644 (file)
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1201,7 +1201,7 @@ typedef struct Scene {
 #define R_NO_OVERWRITE         0x400000  /* skip existing files */
 #define R_TOUCH                                0x800000  /* touch files before rendering */
 #define R_SIMPLIFY                     0x1000000
-#define R_EDGE_FRS                     0x2000000 /* R_EDGE for Freestyle */
+#define R_EDGE_FRS                     0x2000000 /* R_EDGE reserved for Freestyle */
 #define R_PERSISTENT_DATA      0x4000000 /* keep data around for re-render */
 
 /* seq_flag */