3 files changed, 41 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h
new file mode 100644
index 00000000000..14c59d5adb2
--- /dev/null
+++ b/source/blender/makesdna/DNA_freestyle_types.h
@@ -0,0 +1,28 @@
+#ifndef DNA_FREESTYLE_TYPES_H
+#define DNA_FREESTYLE_TYPES_H
+
+#include "DNA_listBase.h"
+
+typedef struct FreestyleModuleConfig {
+	struct FreestyleModuleConfig *next, *prev;
+	
+	char module_path[256];
+	short is_displayed;
+	short pad[3];
+	
+} FreestyleModuleConfig;
+
+typedef struct FreestyleConfig {
+	ListBase modules;
+	
+	int flags;
+	float sphere_radius;
+	float dkr_epsilon;
+	int pad;
+	
+} FreestyleConfig;
+
+
+
+#endif
+
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 73afc3d1a53..8a7d20fbc43 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -37,6 +37,7 @@ extern "C" {
 #include "DNA_vec_types.h"
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
+#include "DNA_freestyle_types.h"
 
 struct Object;
 struct World;
@@ -128,6 +129,9 @@ typedef struct SceneRenderLayer {
 	
 	int passflag;			/* pass_xor has to be after passflag */
 	int pass_xor;
+	
+	struct FreestyleConfig freestyleConfig;
+	
 } SceneRenderLayer;
 
 /* srl->layflag */
@@ -137,6 +141,7 @@ typedef struct SceneRenderLayer {
 #define SCE_LAY_EDGE	8
 #define SCE_LAY_SKY		16
 #define SCE_LAY_STRAND	32
+#define SCE_LAY_FRS		64
 	/* flags between 32 and 0x8000 are set to 1 already, for future options */
 
 #define SCE_LAY_ALL_Z		0x8000
@@ -727,6 +732,11 @@ typedef struct Scene {
 	
 	/* Grease Pencil */
 	struct bGPdata *gpd;
+	
+	/* Freestyle */
+	short freestyle_current_layer_number;
+	short pad[3];
+	
 } Scene;
 
 
@@ -770,6 +780,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 */
 
 /* displaymode */
 
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index cae28f163ed..82de74292c1 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -133,6 +133,7 @@ char *includefiles[] = {
 	"DNA_anim_types.h",
 	"DNA_boid_types.h",
 	"DNA_smoke_types.h",
+	"DNA_freestyle_types.h",
 
 	// empty string to indicate end of includefiles
 	""
@@ -1159,4 +1160,5 @@ int main(int argc, char ** argv)
 #include "DNA_anim_types.h"
 #include "DNA_boid_types.h"
 #include "DNA_smoke_types.h"
+#include "DNA_freestyle_types.h"
 /* end of list */