diff options
Diffstat (limited to 'source/blender/makesdna/DNA_texture_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index f5267f20d2c..bc0b3609a09 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -58,7 +58,7 @@ typedef struct MTex { struct Object *object; struct Tex *tex; char uvname[64]; /* MAX_CUSTOMDATA_LAYER_NAME */ - + char projx, projy, projz, mapping; char brush_map_mode, brush_angle_mode; char pad[2]; @@ -68,10 +68,10 @@ typedef struct MTex { short normapspace, which_output; float r, g, b, k; float def_var, rt; - + /* common */ float colfac, varfac; - + /* material */ float norfac, dispfac, warpfac; float colspecfac, mirrfac, alphafac; @@ -127,10 +127,10 @@ typedef struct PointDensity { float radius; short source; short pad0; - + short color_source; /* psys_color_source */ short ob_color_source; - + int totpoints; struct Object *object; /* for 'Object' or 'Particle system' type - source object */ @@ -138,27 +138,27 @@ typedef struct PointDensity { short psys_cache_space; /* cache points in worldspace, object space, ... ? */ short ob_cache_space; /* cache points in worldspace, object space, ... ? */ char vertex_attribute_name[64]; /* vertex attribute layer for color source, MAX_CUSTOMDATA_LAYER_NAME */ - + void *point_tree; /* the acceleration tree containing points */ float *point_data; /* dynamically allocated extra for extra information, like particle age */ - + float noise_size; short noise_depth; short noise_influence; short noise_basis; short pad1[3]; float noise_fac; - + float speed_scale, falloff_speed_scale, pad2; struct ColorBand *coba; /* for time -> color */ - + struct CurveMapping *falloff_curve; /* falloff density curve */ } PointDensity; typedef struct Tex { ID id; - struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ - + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ + float noisesize, turbul; float bright, contrast, saturation, rfac, gfac, bfac; float filtersize, pad2; @@ -184,7 +184,7 @@ typedef struct Tex { short imaflag, flag; short type, stype; - + float cropxmin, cropymin, cropxmax, cropymax; int texfilter; int afmax; // anisotropic filter maximum value, ewa -> max eccentricity, feline -> max probes @@ -195,21 +195,21 @@ typedef struct Tex { short fie_ima; int len; int frames, offset, sfra; - + float checkerdist, nabla; float pad1; - + struct ImageUser iuser; - + struct bNodeTree *nodetree; struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ struct Image *ima; struct ColorBand *coba; struct PreviewImage *preview; - + char use_nodes; char pad[7]; - + } Tex; /* used for mapping and texture nodes. note: rot is now in radians */ @@ -219,7 +219,7 @@ typedef struct TexMapping { int flag; char projx, projy, projz, mapping; int type; - + float mat[4][4]; float min[3], max[3]; struct Object *ob; @@ -337,7 +337,7 @@ typedef struct ColorMapping { #define TEX_PRV_NOR 64 #define TEX_REPEAT_XMIR 128 #define TEX_REPEAT_YMIR 256 -#define TEX_FLAG_MASK ( TEX_COLORBAND | TEX_FLIPBLEND | TEX_NEGALPHA | TEX_CHECKER_ODD | TEX_CHECKER_EVEN | TEX_PRV_ALPHA | TEX_PRV_NOR | TEX_REPEAT_XMIR | TEX_REPEAT_YMIR ) +#define TEX_FLAG_MASK ( TEX_COLORBAND | TEX_FLIPBLEND | TEX_NEGALPHA | TEX_CHECKER_ODD | TEX_CHECKER_EVEN | TEX_PRV_ALPHA | TEX_PRV_NOR | TEX_REPEAT_XMIR | TEX_REPEAT_YMIR ) #define TEX_DS_EXPAND 512 #define TEX_NO_CLAMP 1024 @@ -455,7 +455,7 @@ typedef struct ColorMapping { #define MTEX_BLEND_SAT 11 #define MTEX_BLEND_VAL 12 #define MTEX_BLEND_COLOR 13 -#define MTEX_SOFT_LIGHT 15 +#define MTEX_SOFT_LIGHT 15 #define MTEX_LIN_LIGHT 16 /* brush_map_mode */ |