Differential D6293 Diff 22007 source/blender/makesdna/DNA_material_types.h

Changeset View

Standalone View

source/blender/makesdna/DNA_material_types.h

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Lines	typedef struct MaterialGPencilStyle {
short index;		short index;
/** Style for drawing strokes (used to select shader type). */		/** Style for drawing strokes (used to select shader type). */
short stroke_style;		short stroke_style;
/** Style for filling areas (used to select shader type). */		/** Style for filling areas (used to select shader type). */
short fill_style;		short fill_style;
/** Factor used to define shader behavior (several uses). */		/** Factor used to define shader behavior (several uses). */
float mix_factor;		float mix_factor;
/** Angle used for gradients orientation. */		/** Angle used for gradients orientation. */
float gradient_angle;		float gradient_angle DNA_DEPRECATED;
/** Radius for radial gradients. */		/** Radius for radial gradients. */
float gradient_radius;		float gradient_radius DNA_DEPRECATED;
/** Cheesboard size. */		char _pad2[4];
float pattern_gridsize;
/** Uv coordinates scale. */		/** Uv coordinates scale. */
float gradient_scale[2];		float gradient_scale[2] DNA_DEPRECATED;
/** Factor to shift filling in 2d space. */		/** Factor to shift filling in 2d space. */
float gradient_shift[2];		float gradient_shift[2] DNA_DEPRECATED;
/** Angle used for texture orientation. */		/** Angle used for texture orientation. */
float texture_angle;		float texture_angle;
/** Texture scale (separated of uv scale). */		/** Texture scale (separated of uv scale). */
float texture_scale[2];		float texture_scale[2];
/** Factor to shift texture in 2d space. */		/** Factor to shift texture in 2d space. */
float texture_offset[2];		float texture_offset[2];
/** Texture opacity. */		/** Texture opacity. */
float texture_opacity;		float texture_opacity;
Show All 10 Lines	typedef struct MaterialGPencilStyle {
/** Mode used to align Dots and Boxes with stroke drawing path and object rotation */		/** Mode used to align Dots and Boxes with stroke drawing path and object rotation */
int alignment_mode;		int alignment_mode;
char _pad[4];		char _pad[4];
} MaterialGPencilStyle;		} MaterialGPencilStyle;

/* MaterialGPencilStyle->flag */		/* MaterialGPencilStyle->flag */
typedef enum eMaterialGPencilStyle_Flag {		typedef enum eMaterialGPencilStyle_Flag {
/* Fill Texture is a pattern */		/* Fill Texture is a pattern */
GP_STYLE_FILL_PATTERN = (1 << 0),		GP_MATERIAL_FILL_PATTERN = (1 << 0),
/* don't display color */		/* don't display color */
GP_STYLE_COLOR_HIDE = (1 << 1),		GP_MATERIAL_HIDE = (1 << 1),
/* protected from further editing */		/* protected from further editing */
GP_STYLE_COLOR_LOCKED = (1 << 2),		GP_MATERIAL_LOCKED = (1 << 2),
/* do onion skinning */		/* do onion skinning */
GP_STYLE_COLOR_ONIONSKIN = (1 << 3),		GP_MATERIAL_ONIONSKIN = (1 << 3),
/* clamp texture */		/* clamp texture */
GP_STYLE_COLOR_TEX_CLAMP = (1 << 4),		GP_MATERIAL_TEX_CLAMP = (1 << 4),
/* mix fill texture */		/* mix fill texture */
GP_STYLE_FILL_TEX_MIX = (1 << 5),		GP_MATERIAL_FILL_TEX_MIX = (1 << 5),
/* Flip fill colors */		/* Flip fill colors */
GP_STYLE_COLOR_FLIP_FILL = (1 << 6),		GP_MATERIAL_FLIP_FILL = (1 << 6),
/* Stroke Texture is a pattern */		/* Stroke Texture is a pattern */
GP_STYLE_STROKE_PATTERN = (1 << 7),		GP_MATERIAL_STROKE_PATTERN = (1 << 7),
/* Stroke show main switch */		/* Stroke show main switch */
GP_STYLE_STROKE_SHOW = (1 << 8),		GP_MATERIAL_STROKE_SHOW = (1 << 8),
/* Fill show main switch */		/* Fill show main switch */
GP_STYLE_FILL_SHOW = (1 << 9),		GP_MATERIAL_FILL_SHOW = (1 << 9),
/* mix stroke texture */		/* mix stroke texture */
GP_STYLE_STROKE_TEX_MIX = (1 << 11),		GP_MATERIAL_STROKE_TEX_MIX = (1 << 11),
/* disable stencil clipping (overlap) */		/* disable stencil clipping (overlap) */
GP_STYLE_DISABLE_STENCIL = (1 << 12),		GP_MATERIAL_DISABLE_STENCIL = (1 << 12),
} eMaterialGPencilStyle_Flag;		} eMaterialGPencilStyle_Flag;

typedef enum eMaterialGPencilStyle_Mode {		typedef enum eMaterialGPencilStyle_Mode {
GP_STYLE_MODE_LINE = 0, /* line */		GP_MATERIAL_MODE_LINE = 0,
GP_STYLE_MODE_DOTS = 1, /* dots */		GP_MATERIAL_MODE_DOT = 1,
GP_STYLE_MODE_BOX = 2, /* rectangles */		GP_MATERIAL_MODE_SQUARE = 2,
} eMaterialGPencilStyle_Mode;		} eMaterialGPencilStyle_Mode;

typedef struct Material {		typedef struct Material {
ID id;		ID id;
/** Animation data (must be immediately after id for utilities to use it). */		/** Animation data (must be immediately after id for utilities to use it). */
struct AnimData *adt;		struct AnimData *adt;

short flag;		short flag;
▲ Show 20 Lines • Show All 180 Lines • ▼ Show 20 Lines	enum {
MA_BS_NONE = 0,		MA_BS_NONE = 0,
MA_BS_SOLID,		MA_BS_SOLID,
MA_BS_CLIP,		MA_BS_CLIP,
MA_BS_HASHED,		MA_BS_HASHED,
};		};

/* Grease Pencil Stroke styles */		/* Grease Pencil Stroke styles */
enum {		enum {
GP_STYLE_STROKE_STYLE_SOLID = 0,		GP_MATERIAL_STROKE_STYLE_SOLID = 0,
GP_STYLE_STROKE_STYLE_TEXTURE,		GP_MATERIAL_STROKE_STYLE_TEXTURE,
};		};

/* Grease Pencil Fill styles */		/* Grease Pencil Fill styles */
enum {		enum {
GP_STYLE_FILL_STYLE_SOLID = 0,		GP_MATERIAL_FILL_STYLE_SOLID = 0,
GP_STYLE_FILL_STYLE_GRADIENT,		GP_MATERIAL_FILL_STYLE_GRADIENT,
GP_STYLE_FILL_STYLE_CHECKER,		GP_MATERIAL_FILL_STYLE_CHECKER, /* DEPRECATED (only for convert old files) */
GP_STYLE_FILL_STYLE_TEXTURE,		GP_MATERIAL_FILL_STYLE_TEXTURE,
};		};

/* Grease Pencil Gradient Types */		/* Grease Pencil Gradient Types */
enum {		enum {
GP_STYLE_GRADIENT_LINEAR = 0,		GP_MATERIAL_GRADIENT_LINEAR = 0,
GP_STYLE_GRADIENT_RADIAL,		GP_MATERIAL_GRADIENT_RADIAL,
};		};

/* Grease Pencil Follow Drawing Modes */		/* Grease Pencil Follow Drawing Modes */
enum {		enum {
GP_STYLE_FOLLOW_PATH = 0,		GP_MATERIAL_FOLLOW_PATH = 0,
GP_STYLE_FOLLOW_OBJ,		GP_MATERIAL_FOLLOW_OBJ,
GP_STYLE_FOLLOW_FIXED,		GP_MATERIAL_FOLLOW_FIXED,
};		};
#endif		#endif