diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-23 07:00:37 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-23 07:00:37 +0400 |
| commit | 62cede96d34d802d97797a635ff8370a5f7556a1 (patch) | |
| tree | ec56d7f332164b34c31607ed882218ce892c9319 /source/blender/makesdna/DNA_meshdata_types.h | |
| parent | 865e80f0f47b8cda1b126c2130114b833c7c5035 (diff) | |
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_.
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 4 |
1 files changed, 0 insertions, 4 deletions
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)]) |