Page MenuHome
Differential D2889 Diff 9436 source/blender/makesdna/DNA_modifier_types.h

Changeset View

Standalone View

View Options

source/blender/makesdna/DNA_modifier_types.h

Show First 20 Lines • Show All 81 Lines • ▼ Show 20 Linestypedef enum ModifierType {
eModifierType_MeshCache = 46, eModifierType_MeshCache = 46,
eModifierType_LaplacianDeform = 47, eModifierType_LaplacianDeform = 47,
eModifierType_Wireframe = 48, eModifierType_Wireframe = 48,
eModifierType_DataTransfer = 49, eModifierType_DataTransfer = 49,
eModifierType_NormalEdit = 50, eModifierType_NormalEdit = 50,
eModifierType_CorrectiveSmooth = 51, eModifierType_CorrectiveSmooth = 51,
eModifierType_MeshSequenceCache = 52, eModifierType_MeshSequenceCache = 52,
eModifierType_SurfaceDeform = 53, eModifierType_SurfaceDeform = 53,
eModifierType_GpencilNoise = 54,
sergeyUnsubmitted
Not Done
Inline Actions

GP modifiers seems to have completely own stack implementation, so i don't think it's beneficial trying to re-use existing modifier flags / structures.

sergey: GP modifiers seems to have completely own stack implementation, so i don't think it's…
eModifierType_GpencilSubdiv = 55,
eModifierType_GpencilThick = 56,
eModifierType_GpencilTint = 57,
eModifierType_GpencilArray = 58,
eModifierType_GpencilDupli = 59,
eModifierType_GpencilOpacity = 60,
eModifierType_GpencilColor = 61,
eModifierType_GpencilLattice = 62,
eModifierType_GpencilSimplify = 63,
eModifierType_GpencilBlur = 64,
eModifierType_GpencilWave = 65,
eModifierType_GpencilPixel = 66,
eModifierType_GpencilSwirl = 67,
NUM_MODIFIER_TYPES NUM_MODIFIER_TYPES
} ModifierType; } ModifierType;
typedef enum ModifierMode { typedef enum ModifierMode {
eModifierMode_Realtime = (1 << 0), eModifierMode_Realtime = (1 << 0),
eModifierMode_Render = (1 << 1), eModifierMode_Render = (1 << 1),
eModifierMode_Editmode = (1 << 2), eModifierMode_Editmode = (1 << 2),
eModifierMode_OnCage = (1 << 3), eModifierMode_OnCage = (1 << 3),
▲ Show 20 Lines • Show All 1,520 Lines • ▼ Show 20 Lines
/* Surface Deform vertex bind modes */ /* Surface Deform vertex bind modes */
enum { enum {
MOD_SDEF_MODE_LOOPTRI = 0, MOD_SDEF_MODE_LOOPTRI = 0,
MOD_SDEF_MODE_NGON = 1, MOD_SDEF_MODE_NGON = 1,
MOD_SDEF_MODE_CENTROID = 2, MOD_SDEF_MODE_CENTROID = 2,
}; };
typedef struct GpencilNoiseModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
int passindex; /* custom index for passes */
int flag; /* several flags */
float factor; /* factor of noise */
int step; /* how many frames before recalculate randoms */
int gp_frame; /* last gp frame used */
int scene_frame; /* last scene frame used */
float vrand1, vrand2; /* random values */
} GpencilNoiseModifierData;
typedef enum eGpencilNoise_Flag {
GP_NOISE_USE_RANDOM = (1 << 0),
GP_NOISE_MOD_LOCATION = (1 << 1),
GP_NOISE_MOD_STRENGTH = (1 << 2),
GP_NOISE_MOD_THICKNESS = (1 << 3),
GP_NOISE_FULL_STROKE = (1 << 4),
GP_NOISE_MOVE_EXTREME = (1 << 5),
GP_NOISE_INVERSE_LAYER = (1 << 6),
GP_NOISE_INVERSE_PASS = (1 << 7),
GP_NOISE_INVERSE_VGROUP = (1 << 8)
} eGpencilNoise_Flag;
typedef struct GpencilSubdivModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
int passindex; /* custom index for passes */
int flag; /* flags */
int level; /* factor of subdivision */
char pad[4];
} GpencilSubdivModifierData;
typedef enum eGpencilSubdiv_Flag {
GP_SUBDIV_SIMPLE = (1 << 0),
GP_SUBDIV_INVERSE_LAYER = (1 << 1),
GP_SUBDIV_INVERSE_PASS = (1 << 2),
} eGpencilSubdiv_Flag;
typedef struct GpencilThickModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
int passindex; /* custom index for passes */
int flag; /* flags */
int thickness; /* Thickness change */
char pad[4];
struct CurveMapping *cur_thickness;
} GpencilThickModifierData;
typedef enum eGpencilThick_Flag {
GP_THICK_INVERSE_LAYER = (1 << 0),
GP_THICK_INVERSE_PASS = (1 << 1),
GP_THICK_INVERSE_VGROUP = (1 << 2),
GP_THICK_CUSTOM_CURVE = (1 << 3),
} eGpencilThick_Flag;
typedef struct GpencilTintModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
int passindex; /* custom index for passes */
int flag; /* flags */
campbellbartonUnsubmitted
Not Done
Inline Actions

curve_ prefix, elsewhere too.

campbellbarton: `curve_` prefix, elsewhere too.
float rgb[3]; /* Tint color */
float factor; /* Mix factor */
} GpencilTintModifierData;
typedef enum eGpencilTint_Flag {
GP_TINT_CREATE_COLORS = (1 << 0),
GP_TINT_INVERSE_LAYER = (1 << 1),
GP_TINT_INVERSE_PASS = (1 << 2),
} eGpencilTint_Flag;
typedef struct GpencilColorModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
int passindex; /* custom index for passes */
int flag; /* flags */
float hsv[3]; /* hsv factors */
char pad[4];
} GpencilColorModifierData;
typedef enum eGpencilColor_Flag {
GP_COLOR_CREATE_COLORS = (1 << 0),
GP_COLOR_INVERSE_LAYER = (1 << 1),
GP_COLOR_INVERSE_PASS = (1 << 2),
} eGpencilColor_Flag;
typedef struct GpencilOpacityModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
int passindex; /* custom index for passes */
int flag; /* flags */
float factor; /* Main Opacity factor */
char pad[4];
} GpencilOpacityModifierData;
typedef enum eGpencilOpacity_Flag {
GP_OPACITY_INVERSE_LAYER = (1 << 0),
GP_OPACITY_INVERSE_PASS = (1 << 1),
GP_OPACITY_INVERSE_VGROUP = (1 << 2),
} eGpencilOpacity_Flag;
typedef struct GpencilArrayModifierData {
ModifierData modifier;
int count[3]; /* number of elements in array */
int flag; /* several flags */
float offset[3]; /* Location increments */
float shift[3]; /* shift increment */
float rnd_size; /* random size factor */
float rnd_rot; /* random size factor */
float rot[3]; /* Rotation changes */
float scale[3]; /* Scale changes */
float rnd[20]; /* (first element is the index) random values */
int lock_axis; /* lock shift to one axis */
char pad[4];
void *C; /* bContext used only for apply */
} GpencilArrayModifierData;
typedef enum eGpencilArray_Flag {
GP_ARRAY_RANDOM_SIZE = (1 << 0),
GP_ARRAY_RANDOM_ROT = (1 << 1),
} eGpencilArray_Flag;
typedef struct GpencilDupliModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
int passindex; /* custom index for passes */
int flag; /* several flags */
float rnd_size; /* random size factor */
float rnd_rot; /* random size factor */
float offset[3]; /* Location increments */
float rot[3]; /* Rotation changes */
float scale[3]; /* Scale changes */
int count; /* number of elements in array */
float rnd[20]; /* (first element is the index) random values */
} GpencilDupliModifierData;
typedef enum eGpencilDupli_Flag {
GP_DUPLI_RANDOM_SIZE = (1 << 0),
GP_DUPLI_RANDOM_ROT = (1 << 1),
GP_DUPLI_INVERSE_LAYER = (1 << 2),
GP_DUPLI_INVERSE_PASS = (1 << 3),
} eGpencilDupli_Flag;
typedef struct GpencilLatticeModifierData {
ModifierData modifier;
struct Object *object;
char layername[64]; /* layer name */
char vgname[64]; /* optional vertexgroup name, MAX_VGROUP_NAME */
int passindex; /* custom index for passes */
int flag; /* flags */
float strength;
char pad[4];
void *cache_data; /* runtime only (LatticeDeformData) */
void *C; /* bContext used only for apply */
campbellbartonUnsubmitted
Not Done
Inline Actions

This isn't really good to use the context in a modifier.

Modifiers should be able to operate with their input arguments only.

campbellbarton: This isn't really good to use the context in a modifier. Modifiers should be able to operate…
} GpencilLatticeModifierData;
typedef enum eGpencilLattice_Flag {
GP_LATTICE_INVERSE_LAYER = (1 << 0),
GP_LATTICE_INVERSE_PASS = (1 << 1),
GP_LATTICE_INVERSE_VGROUP = (1 << 2),
} eGpencilLattice_Flag;
typedef struct GpencilSimplifyModifierData {
ModifierData modifier;
char layername[64]; /* layer name */
int passindex; /* custom index for passes */
int flag; /* flags */
float factor; /* factor of simplify */
char pad[4];
} GpencilSimplifyModifierData;
typedef enum eGpencilSimplify_Flag {
GP_SIMPLIFY_INVERSE_LAYER = (1 << 0),
GP_SIMPLIFY_INVERSE_PASS = (1 << 1),
} eGpencilSimplify_Flag;
typedef struct GpencilBlurModifierData {
ModifierData modifier;
int radius[2];
int flag; /* flags */
char pad[4];
} GpencilBlurModifierData;
typedef struct GpencilWaveModifierData {
ModifierData modifier;
float amplitude;
float period;
float phase;
int orientation;
int flag; /* flags */
char pad[4];
} GpencilWaveModifierData;
typedef struct GpencilPixelModifierData {
ModifierData modifier;
int size[2];
int flag; /* flags */
float rgba[4];
char pad[4];
} GpencilPixelModifierData;
typedef enum eGpencilPixel_Flag {
GP_PIXEL_USE_LINES = (1 << 0),
} eGpencilPixel_Flag;
typedef struct GpencilSwirlModifierData {
ModifierData modifier;
int center[2];
int flag; /* flags */
int radius;
float angle;
char pad[4];
} GpencilSwirlModifierData;
typedef enum eGpencilSwirl_Flag {
GP_SWIRL_MAKE_TRANSPARENT = (1 << 0),
GP_SWIRL_USE_OB_LOC = (1 << 1),
} eGpencilSwirl_Flag;
#define MOD_MESHSEQ_READ_ALL \ #define MOD_MESHSEQ_READ_ALL \
(MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | MOD_MESHSEQ_READ_COLOR) (MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | MOD_MESHSEQ_READ_COLOR)
#endif /* __DNA_MODIFIER_TYPES_H__ */ #endif /* __DNA_MODIFIER_TYPES_H__ */