Merged changes in the trunk up to revision 52815.

[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 8e0a36a8a43e86099fa6c4c27e47b9cb5317a42e..8af971b9b65b5a37facb4b8b9ecd361a4381c5a4 100644 (file)
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -45,6 +45,7 @@ extern "C" {
 #include "DNA_vec_types.h"
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
+#include "DNA_freestyle_types.h"
 
 struct Object;
 struct Brush;
@@ -187,6 +188,9 @@ typedef struct SceneRenderLayer {
 
        int samples;
        int pad;
+       
+       struct FreestyleConfig freestyleConfig;
+       
 } SceneRenderLayer;
 
 /* srl->layflag */
@@ -196,7 +200,8 @@ typedef struct SceneRenderLayer {
 #define SCE_LAY_EDGE   8
 #define SCE_LAY_SKY            16
 #define SCE_LAY_STRAND 32
-       /* flags between 32 and 0x8000 are set to 1 already, for future options */
+#define SCE_LAY_FRS            64
+       /* flags between 64 and 0x8000 are set to 1 already, for future options */
 
 #define SCE_LAY_ALL_Z          0x8000
 #define SCE_LAY_XOR                    0x10000
@@ -535,6 +540,10 @@ typedef struct RenderData {
        float pad2;
        struct Text *dometext  DNA_DEPRECATED;  //  XXX deprecated since 2.5
 
+       /* Freestyle line thickness options */
+       int line_thickness_mode;
+       float unit_line_thickness; /* in pixels */
+
        /* render engine */
        char engine[32];
 } RenderData;
@@ -1308,6 +1317,10 @@ typedef struct Scene {
 /* simplify_flag */
 #define R_SIMPLE_NO_TRIANGULATE                1
 
+/* line_thickness_mode */
+#define R_LINE_THICKNESS_ABSOLUTE 1
+#define R_LINE_THICKNESS_RELATIVE 2
+
 /* sequencer seq_prev_type seq_rend_type */
 
 
@@ -1446,9 +1459,9 @@ typedef struct Scene {
 
 /* Paint.flags */
 typedef enum {
-       PAINT_SHOW_BRUSH = (1 << 0),
-       PAINT_FAST_NAVIGATE = (1 << 1),
-       PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2),
+       PAINT_SHOW_BRUSH = (1<<0),
+       PAINT_FAST_NAVIGATE = (1<<1),
+       PAINT_SHOW_BRUSH_ON_SURFACE = (1<<2),
 } PaintFlags;
 
 /* Sculpt.flags */
@@ -1502,6 +1515,7 @@ typedef enum SculptFlags {
 #define EDGE_MODE_TAG_SHARP                            2
 #define EDGE_MODE_TAG_CREASE                   3
 #define EDGE_MODE_TAG_BEVEL                            4
+#define EDGE_MODE_TAG_FREESTYLE                        5
 
 /* toolsettings->gpencil_flags */
 #define GP_TOOL_FLAG_PAINTSESSIONS_ON  (1<<0)