diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-06 18:45:50 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-06 18:45:50 +0400 |
| commit | 4c16d3e2316f910b636fc63a20a385ea0dbf6436 (patch) | |
| tree | 9323c5222004a8fdb206480a6c9d0f1526fad1dc /source/blender/makesdna | |
| parent | acfc0ea5111bcab5ea5795187d08b2f6ec5addaa (diff) | |
| parent | 2ed2226ee753cc6a7a19806d99772efa61af897f (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')
| -rw-r--r-- | source/blender/makesdna/DNA_freestyle_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h index ce14882ebbc..2c2d704922f 100644 --- a/source/blender/makesdna/DNA_freestyle_types.h +++ b/source/blender/makesdna/DNA_freestyle_types.h @@ -28,7 +28,6 @@ #ifndef __DNA_FREESTYLE_TYPES_H__ #define __DNA_FREESTYLE_TYPES_H__ -#include "DNA_defs.h" #include "DNA_listBase.h" struct FreestyleLineStyle; @@ -111,7 +110,6 @@ typedef struct FreestyleModuleConfig { struct FreestyleModuleConfig *next, *prev; struct Text *script; - char module_path[1024] DNA_DEPRECATED; /* FILE_MAX */ short is_displayed; short pad[3]; } FreestyleModuleConfig; 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)]) |