A major code update for making the DNA file specification of Freestyle settings

and RNA for it independent of the build flag for enabling Freestyle.  Suggested
by Sergey Sharybin through a code review of the branch.

* Many #ifdef WITH_FREESTYLE blocks were removed to always have Freestyle-specific
DNA file specification and RNA for it built in Blender.  This will allow Freestyle
setting survive even when a non-Freestyle build is used for loading and saving
files.  It is noted that operations are still conditionally built through #ifdef
WITH_FREESTYLE blocks.

* To this end, new blenkernel files BKE_freestyle.h and intern/freestyle.c have
been added.  All API functions in FRS_freestyle_config.h as well as some of those
in FRS_freestyle.h were moved to the new files.  Now the relocated API functions
have BKE_ prefix instead of FRS_.

10 files changed, 2 insertions, 39 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 289af755170..9103914c3e7 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -212,9 +212,7 @@ typedef struct PreviewImage {
 #define ID_WM		MAKE_ID2('W', 'M') /* WindowManager */
 #define ID_MC		MAKE_ID2('M', 'C') /* MovieClip */
 #define ID_MSK		MAKE_ID2('M', 'S') /* Mask */
-/* #ifdef WITH_FREESTYLE */
-#  define ID_LS		MAKE_ID2('L', 'S') /* FreestyleLineStyle */
-/* #endif */
+#define ID_LS		MAKE_ID2('L', 'S') /* FreestyleLineStyle */
 
 	/* NOTE! Fake IDs, needed for g.sipo->blocktype or outliner */
 #define ID_SEQ		MAKE_ID2('S', 'Q')
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 392c92148b4..eded0b4b76e 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -560,9 +560,7 @@ typedef enum eDopeSheet_FilterFlag {
 	ADS_FILTER_NONTREE          = (1 << 19),
 	ADS_FILTER_NOTEX            = (1 << 20),
 	ADS_FILTER_NOSPK            = (1 << 21),
-/* #ifdef WITH_FREESTYLE */
 	ADS_FILTER_NOLINESTYLE      = (1 << 22),
-/* #endif */
 
 	/* NLA-specific filters */
 	ADS_FILTER_NLA_NOACT        = (1 << 25),  /* if the AnimData block has no NLA data, don't include to just show Action-line */
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 544535303bd..e23b85b5a4e 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -177,10 +177,8 @@ typedef struct Material {
 	short shadowonly_flag;  /* "shadowsonly" type */
 	short index;            /* custom index for render passes */
 
-/* #ifdef WITH_FREESTYLE */
 	short vcol_alpha;
 	short pad4[3];
-/* #endif */
 
 	ListBase gpumaterial;		/* runtime */
 } Material;
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index c125518ba73..df8b423fcad 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -203,10 +203,8 @@ typedef struct TFace {
 /* debug only option */
 #define ME_DRAWEXTRA_INDICES (1 << 13)
 
-/* #ifdef WITH_FREESTYLE */
 #define ME_DRAW_FREESTYLE_EDGE (1 << 14)
 #define ME_DRAW_FREESTYLE_FACE (1 << 15)
-/* #endif */
 
 /* Subsurf Type */
 #define ME_CC_SUBSURF 		0
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index b849ca28d49..0eba83dae55 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -311,9 +311,7 @@ typedef struct FreestyleFace {
 #define ME_LOOSEEDGE		(1<<7)
 /* #define ME_SEAM_LAST		(1<<8) */ /* UNUSED */
 #define ME_SHARP			(1<<9)    /* only reason this flag remains a 'short' */
-/* #ifdef WITH_FREESTYLE */
 #define ME_FREESTYLE_EDGE	(1<<10) /* TO BE REMOVED when the trunk merger is done */
-/* #endif */
 
 /* puno = vertexnormal (mface) */
 #define ME_PROJXY		16
@@ -330,9 +328,7 @@ typedef struct FreestyleFace {
 /* flag (mface) */
 #define ME_SMOOTH			1
 #define ME_FACE_SEL			2
-/* #ifdef WITH_FREESTYLE */
 #define ME_FREESTYLE_FACE	4 /* TO BE REMOVED when the trunk merger is done */
-/* #endif */
 /* flag ME_HIDE==16 is used here too */ 
 
 #define ME_POLY_LOOP_PREV(mloop, mp, i)  (&(mloop)[(mp)->loopstart + (((i) + (mp)->totloop - 1) % (mp)->totloop)])
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 702df31f832..a106afd38b2 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -45,9 +45,7 @@ extern "C" {
 #include "DNA_vec_types.h"
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
-/* #ifdef WITH_FREESTYLE */
 #include "DNA_freestyle_types.h"
-/* #endif */
 
 struct Object;
 struct Brush;
@@ -191,9 +189,7 @@ typedef struct SceneRenderLayer {
 	int samples;
 	int pad;
 	
-/* #ifdef WITH_FREESTYLE */
 	struct FreestyleConfig freestyleConfig;
-/* #endif */
 } SceneRenderLayer;
 
 /* srl->layflag */
@@ -203,10 +199,8 @@ typedef struct SceneRenderLayer {
 #define SCE_LAY_EDGE	8
 #define SCE_LAY_SKY		16
 #define SCE_LAY_STRAND	32
-/* #ifdef WITH_FREESTYLE */
 #define SCE_LAY_FRS		64
-/* #endif */
-	/* flags between 64 and 0x8000 are set to 1 already, for future options */
+	/* flags between 128 and 0x8000 are set to 1 already, for future options */
 
 #define SCE_LAY_ALL_Z		0x8000
 #define SCE_LAY_XOR			0x10000
@@ -554,11 +548,9 @@ typedef struct RenderData {
 	float pad2;
 	struct Text *dometext  DNA_DEPRECATED;	//  XXX deprecated since 2.5
 
-/* #ifdef WITH_FREESTYLE */
 	/* Freestyle line thickness options */
 	int line_thickness_mode;
 	float unit_line_thickness; /* in pixels */
-/* #endif */
 
 	/* render engine */
 	char engine[32];
@@ -1354,11 +1346,9 @@ typedef struct Scene {
 /* simplify_flag */
 #define R_SIMPLE_NO_TRIANGULATE		1
 
-/* #ifdef WITH_FREESTYLE */
 /* line_thickness_mode */
 #define R_LINE_THICKNESS_ABSOLUTE 1
 #define R_LINE_THICKNESS_RELATIVE 2
-/* #endif */
 
 /* sequencer seq_prev_type seq_rend_type */
 
@@ -1568,9 +1558,7 @@ typedef enum SculptFlags {
 #define EDGE_MODE_TAG_SHARP				2
 #define EDGE_MODE_TAG_CREASE			3
 #define EDGE_MODE_TAG_BEVEL				4
-/* #ifdef WITH_FREESTYLE */
 #define EDGE_MODE_TAG_FREESTYLE			5
-/* #endif */
 
 /* toolsettings->gpencil_flags */
 #define GP_TOOL_FLAG_PAINTSESSIONS_ON	(1<<0)
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 950483ba3ff..c70433eeea3 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -240,9 +240,7 @@ typedef struct ThemeSpace {
 	char bone_solid[4], bone_pose[4], bone_pose_active[4];
 	char strip[4], strip_select[4];
 	char cframe[4];
-/* #ifdef WITH_FREESTYLE */
 	char freestyle_edge_mark[4], freestyle_face_mark[4];
-/* #endif */
 	
 	char nurb_uline[4], nurb_vline[4];
 	char act_spline[4], nurb_sel_uline[4], nurb_sel_vline[4], lastsel_point[4];
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 0632564b998..0ad52d9b3a3 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -34,10 +34,6 @@ blender_include_dirs(
 	..
 )
 
-if(WITH_FREESTYLE)
-	add_definitions(-DWITH_FREESTYLE)
-endif()
-
 # -----------------------------------------------------------------------------
 # Build makesdna executable
 set(SRC
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index 8fd5b67c44b..add9611866d 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -39,9 +39,6 @@ root_build_dir=normpath(env['BF_BUILDDIR'])
 source_files = ['makesdna.c']
 header_files = env.Glob('../*.h')
 
-if env['WITH_BF_FREESTYLE']:
-    defines.append('WITH_FREESTYLE')
-
 makesdna_tool = env.Clone()
 dna = env.Clone()
 makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index acc6597d2c7..da1811656a6 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -134,10 +134,8 @@ static const char *includefiles[] = {
 	"DNA_dynamicpaint_types.h",
 	"DNA_mask_types.h",
 	"DNA_rigidbody_types.h",
-/* #ifdef WITH_FREESTYLE */
 	"DNA_freestyle_types.h",
 	"DNA_linestyle_types.h",
-/* #endif */
 
 	/* empty string to indicate end of includefiles */
 	""
@@ -1272,8 +1270,6 @@ int main(int argc, char **argv)
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_rigidbody_types.h"
-/* #ifdef WITH_FREESTYLE */
 #include "DNA_freestyle_types.h"
 #include "DNA_linestyle_types.h"
-/* #endif */
 /* end of list */