diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-03 13:51:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-03 13:54:59 +0400 |
| commit | b7f085d9c128f31d576c732c6439b5a71e8922ee (patch) | |
| tree | 8a1fdc2e95470f61d9121b18b125dc272e87d536 /source/blender/makesdna | |
| parent | 6ec2d72eca618be05e9bf0723886b10e6d5efa46 (diff) | |
Patch D246: Texture Marks for freestyle strokes, written and contributed by Paolo Acampora.
Reviewers: brecht, kjym3, #freestyle
Reviewed By: brecht, kjym3
Differential Revision: https://developer.blender.org/D246
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_linestyle_types.h | 20 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 1 |
3 files changed, 21 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h index 8d5f81ede5a..f7ba53c1f79 100644 --- a/source/blender/makesdna/DNA_linestyle_types.h +++ b/source/blender/makesdna/DNA_linestyle_types.h @@ -35,8 +35,16 @@ #include "DNA_listBase.h" #include "DNA_ID.h" +#ifndef MAX_MTEX +#define MAX_MTEX 18 +#endif + +/* texco (also in DNA_material_types.h) */ +#define TEXCO_STROKE 16 /* actually it's UV */ + struct ColorBand; struct CurveMapping; +struct MTex; typedef struct LineStyleModifier { struct LineStyleModifier *next, *prev; @@ -354,7 +362,8 @@ typedef struct LineStyleThicknessModifier_Calligraphy { #define LS_PANEL_ALPHA 3 #define LS_PANEL_THICKNESS 4 #define LS_PANEL_GEOMETRY 5 -#define LS_PANEL_MISC 6 +#define LS_PANEL_TEXTURE 6 +#define LS_PANEL_MISC 7 /* FreestyleLineStyle::flag */ #define LS_DS_EXPAND (1 << 0) /* for animation editors */ @@ -370,6 +379,7 @@ typedef struct LineStyleThicknessModifier_Calligraphy { #define LS_SPLIT_PATTERN (1 << 10) #define LS_NO_SORTING (1 << 11) #define LS_REVERSE_ORDER (1 << 12) /* for sorting */ +#define LS_TEXTURE (1 << 13) /* FreestyleLineStyle::chaining */ #define LS_CHAINING_PLAIN 1 @@ -415,10 +425,16 @@ typedef struct FreestyleLineStyle { unsigned short split_dash2, split_gap2; unsigned short split_dash3, split_gap3; int sort_key, integration_type; - int pad; + float texstep; + short texact, pr_texture; + short use_nodes, pad; unsigned short dash1, gap1, dash2, gap2, dash3, gap3; int panel; /* for UI */ + struct MTex *mtex[18]; /* MAX_MTEX */ + /* nodes */ + struct bNodeTree *nodetree; + ListBase color_modifiers; ListBase alpha_modifiers; ListBase thickness_modifiers; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 54fcb5c857b..c7a6d4809a5 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -209,6 +209,7 @@ typedef enum eSpaceButtons_Texture_Context { SB_TEXC_LAMP = 2, SB_TEXC_PARTICLES = 3, SB_TEXC_OTHER = 4, + SB_TEXC_LINESTYLE = 5, } eSpaceButtons_Texture_Context; /* sbuts->align */ @@ -981,6 +982,7 @@ typedef enum eSpaceNode_TexFrom { SNODE_TEX_OBJECT = 0, SNODE_TEX_WORLD = 1, SNODE_TEX_BRUSH = 2, + SNODE_TEX_LINESTYLE = 3, } eSpaceNode_TexFrom; /* snode->shaderfrom */ diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index a3025a7fb31..1906f71a230 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -479,6 +479,7 @@ typedef struct ColorMapping { #define MTEX_BUMP_OBJECTSPACE 1024 #define MTEX_BUMP_TEXTURESPACE 2048 /* #define MTEX_BUMP_FLIPPED 4096 */ /* UNUSED */ +#define MTEX_TIPS 4096 /* should use with_freestyle flag? */ #define MTEX_BICUBIC_BUMP 8192 #define MTEX_MAPTO_BOUNDS 16384 |