Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-04-06 18:45:50 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-04-06 18:45:50 +0400
commit4c16d3e2316f910b636fc63a20a385ea0dbf6436 (patch)
tree9323c5222004a8fdb206480a6c9d0f1526fad1dc /source/blender/makesdna/DNA_meshdata_types.h
parentacfc0ea5111bcab5ea5795187d08b2f6ec5addaa (diff)
parent2ed2226ee753cc6a7a19806d99772efa61af897f (diff)
Pre-merger changes.soc-2008-mxcurioni
Deprecated Freestyle-specific elements were removed from the code base, in order to address all comments from branch code reviews. https://codereview.appspot.com/7416049/ Backward compatibility won't be maintained in the following components: - Freestyle edge/face marks in old .blend files are ignored. Old .blend files can be converted by loading and saving the files using a Freestyle branch build between revision 55581 and 55842. - External style modules are no longer supported. Instead text datablocks must be used to keep style module files within .blend files. A branch build between revision 55741 and 55842 is useful for identifying the style module file names that need reconfiguring.
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
-rw-r--r--source/blender/makesdna/DNA_meshdata_types.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 0eba83dae55..d1e123cb826 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -311,7 +311,6 @@ 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' */
-#define ME_FREESTYLE_EDGE (1<<10) /* TO BE REMOVED when the trunk merger is done */
/* puno = vertexnormal (mface) */
#define ME_PROJXY 16
@@ -328,7 +327,6 @@ typedef struct FreestyleFace {
/* flag (mface) */
#define ME_SMOOTH 1
#define ME_FACE_SEL 2
-#define ME_FREESTYLE_FACE 4 /* TO BE REMOVED when the trunk merger is done */
/* 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)])