Cleanup: trailing commas
This commit is contained in:
@@ -156,7 +156,7 @@ typedef enum {
|
||||
AVI_FORMAT_RGB24, /* The most basic of forms, 3 bytes per pixel, 1 per r, g, b */
|
||||
AVI_FORMAT_RGB32, /* The second most basic of forms, 4 bytes per pixel, 1 per r, g, b, alpha */
|
||||
AVI_FORMAT_AVI_RGB, /* Same as above, but is in the weird AVI order (bottom to top, left to right) */
|
||||
AVI_FORMAT_MJPEG /* Motion-JPEG */
|
||||
AVI_FORMAT_MJPEG, /* Motion-JPEG */
|
||||
} AviFormat;
|
||||
|
||||
typedef struct _AviStreamRec {
|
||||
@@ -198,7 +198,7 @@ typedef enum {
|
||||
AVI_ERROR_FORMAT,
|
||||
AVI_ERROR_ALLOC,
|
||||
AVI_ERROR_FOUND,
|
||||
AVI_ERROR_OPTION
|
||||
AVI_ERROR_OPTION,
|
||||
} AviError;
|
||||
|
||||
/* belongs to the option-setting function. */
|
||||
@@ -206,7 +206,7 @@ typedef enum {
|
||||
AVI_OPTION_WIDTH = 0,
|
||||
AVI_OPTION_HEIGHT,
|
||||
AVI_OPTION_QUALITY,
|
||||
AVI_OPTION_FRAMERATE
|
||||
AVI_OPTION_FRAMERATE,
|
||||
} AviOption;
|
||||
|
||||
/* The offsets that will always stay the same in AVI files we
|
||||
|
@@ -100,7 +100,7 @@ typedef struct DMFlagMat {
|
||||
|
||||
typedef enum DerivedMeshType {
|
||||
DM_TYPE_CDDM,
|
||||
DM_TYPE_CCGDM
|
||||
DM_TYPE_CCGDM,
|
||||
} DerivedMeshType;
|
||||
|
||||
typedef enum DMForeachFlag {
|
||||
|
@@ -68,7 +68,7 @@ struct BVHTreeOverlap *BKE_bmbvh_overlap(const BMBVHTree *bmtree_a, const BMBVHT
|
||||
enum {
|
||||
BMBVH_RETURN_ORIG = (1 << 0), /* use with 'cos_cage', returns hits in relation to original geometry */
|
||||
BMBVH_RESPECT_SELECT = (1 << 1), /* restrict to hidden geometry (overrides BMBVH_RESPECT_HIDDEN) */
|
||||
BMBVH_RESPECT_HIDDEN = (1 << 2) /* omit hidden geometry */
|
||||
BMBVH_RESPECT_HIDDEN = (1 << 2), /* omit hidden geometry */
|
||||
};
|
||||
|
||||
#endif /* __BKE_EDITMESH_BVH_H__ */
|
||||
|
@@ -160,7 +160,7 @@ typedef enum eFMI_Action_Types {
|
||||
/* modifier only modifies the values of points (but times stay the same) */
|
||||
FMI_TYPE_REPLACE_VALUES,
|
||||
/* modifier generates a curve regardless of what came before */
|
||||
FMI_TYPE_GENERATE_CURVE
|
||||
FMI_TYPE_GENERATE_CURVE,
|
||||
} eFMI_Action_Types;
|
||||
|
||||
/* Flags for the requirements of a FModifier Type */
|
||||
@@ -271,7 +271,7 @@ typedef enum eFCU_Cycle_Type {
|
||||
/* The cycle repeats identically to the base range. */
|
||||
FCU_CYCLE_PERFECT,
|
||||
/* The cycle accumulates the change between start and end keys. */
|
||||
FCU_CYCLE_OFFSET
|
||||
FCU_CYCLE_OFFSET,
|
||||
} eFCU_Cycle_Type;
|
||||
|
||||
eFCU_Cycle_Type BKE_fcurve_get_cycle_type(struct FCurve *fcu);
|
||||
|
@@ -253,7 +253,7 @@ typedef enum eNodeSizePreset {
|
||||
NODE_SIZE_DEFAULT,
|
||||
NODE_SIZE_SMALL,
|
||||
NODE_SIZE_MIDDLE,
|
||||
NODE_SIZE_LARGE
|
||||
NODE_SIZE_LARGE,
|
||||
} eNodeSizePreset;
|
||||
|
||||
struct bNodeTreeExec;
|
||||
|
@@ -331,7 +331,7 @@ typedef enum eObRelationTypes {
|
||||
typedef enum eObjectSet {
|
||||
OB_SET_SELECTED, /* Selected Objects */
|
||||
OB_SET_VISIBLE, /* Visible Objects */
|
||||
OB_SET_ALL /* All Objects */
|
||||
OB_SET_ALL, /* All Objects */
|
||||
} eObjectSet;
|
||||
|
||||
struct LinkNode *BKE_object_relational_superset(
|
||||
|
@@ -132,7 +132,7 @@ void BKE_pbvh_draw_cb(
|
||||
typedef enum {
|
||||
PBVH_FACES,
|
||||
PBVH_GRIDS,
|
||||
PBVH_BMESH
|
||||
PBVH_BMESH,
|
||||
} PBVHType;
|
||||
|
||||
PBVHType BKE_pbvh_type(const PBVH *bvh);
|
||||
|
@@ -258,7 +258,7 @@ typedef enum {
|
||||
SEQ_STRIPELEM_IBUF,
|
||||
SEQ_STRIPELEM_IBUF_COMP,
|
||||
SEQ_STRIPELEM_IBUF_STARTSTILL,
|
||||
SEQ_STRIPELEM_IBUF_ENDSTILL
|
||||
SEQ_STRIPELEM_IBUF_ENDSTILL,
|
||||
} eSeqStripElemIBuf;
|
||||
|
||||
void BKE_sequencer_cache_destruct(void);
|
||||
|
@@ -99,15 +99,15 @@ struct DerivedMesh;
|
||||
enum {
|
||||
Vert_eEffected = (1 << 0),
|
||||
Vert_eChanged = (1 << 1),
|
||||
Vert_eSeam = (1 << 2)
|
||||
Vert_eSeam = (1 << 2),
|
||||
} /*VertFlags*/;
|
||||
|
||||
enum {
|
||||
Edge_eEffected = (1 << 0)
|
||||
Edge_eEffected = (1 << 0),
|
||||
} /*CCGEdgeFlags*/;
|
||||
|
||||
enum {
|
||||
Face_eEffected = (1 << 0)
|
||||
Face_eEffected = (1 << 0),
|
||||
} /*FaceFlags*/;
|
||||
|
||||
struct CCGVert {
|
||||
|
@@ -207,7 +207,7 @@ typedef enum eGPCurveMappingPreset {
|
||||
GPCURVE_PRESET_PENCIL = 0,
|
||||
GPCURVE_PRESET_INK = 1,
|
||||
GPCURVE_PRESET_INKNOISE = 2,
|
||||
GPCURVE_PRESET_MARKER = 3
|
||||
GPCURVE_PRESET_MARKER = 3,
|
||||
} eGPCurveMappingPreset;
|
||||
|
||||
static void brush_gpencil_curvemap_reset(CurveMap *cuma, int tot, int preset)
|
||||
|
@@ -663,7 +663,7 @@ static bConstraintTypeInfo CTI_CONSTRNAME = {
|
||||
constrname_get_tars, /* get constraint targets */
|
||||
constrname_flush_tars, /* flush constraint targets */
|
||||
constrname_get_tarmat, /* get target matrix */
|
||||
constrname_evaluate /* evaluate */
|
||||
constrname_evaluate, /* evaluate */
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -916,7 +916,7 @@ static bConstraintTypeInfo CTI_CHILDOF = {
|
||||
childof_get_tars, /* get constraint targets */
|
||||
childof_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get a target matrix */
|
||||
childof_evaluate /* evaluate */
|
||||
childof_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* -------- TrackTo Constraint ------- */
|
||||
@@ -1094,7 +1094,7 @@ static bConstraintTypeInfo CTI_TRACKTO = {
|
||||
trackto_get_tars, /* get constraint targets */
|
||||
trackto_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
trackto_evaluate /* evaluate */
|
||||
trackto_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* --------- Inverse-Kinematics --------- */
|
||||
@@ -1187,7 +1187,7 @@ static bConstraintTypeInfo CTI_KINEMATIC = {
|
||||
kinematic_get_tars, /* get constraint targets */
|
||||
kinematic_flush_tars, /* flush constraint targets */
|
||||
kinematic_get_tarmat, /* get target matrix */
|
||||
NULL /* evaluate - solved as separate loop */
|
||||
NULL, /* evaluate - solved as separate loop */
|
||||
};
|
||||
|
||||
/* -------- Follow-Path Constraint ---------- */
|
||||
@@ -1358,7 +1358,7 @@ static bConstraintTypeInfo CTI_FOLLOWPATH = {
|
||||
followpath_get_tars, /* get constraint targets */
|
||||
followpath_flush_tars, /* flush constraint targets */
|
||||
followpath_get_tarmat, /* get target matrix */
|
||||
followpath_evaluate /* evaluate */
|
||||
followpath_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* --------- Limit Location --------- */
|
||||
@@ -1406,7 +1406,7 @@ static bConstraintTypeInfo CTI_LOCLIMIT = {
|
||||
NULL, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
NULL, /* get target matrix */
|
||||
loclimit_evaluate /* evaluate */
|
||||
loclimit_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* -------- Limit Rotation --------- */
|
||||
@@ -1463,7 +1463,7 @@ static bConstraintTypeInfo CTI_ROTLIMIT = {
|
||||
NULL, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
NULL, /* get target matrix */
|
||||
rotlimit_evaluate /* evaluate */
|
||||
rotlimit_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* --------- Limit Scale --------- */
|
||||
@@ -1522,7 +1522,7 @@ static bConstraintTypeInfo CTI_SIZELIMIT = {
|
||||
NULL, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
NULL, /* get target matrix */
|
||||
sizelimit_evaluate /* evaluate */
|
||||
sizelimit_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Copy Location ------------- */
|
||||
@@ -1612,7 +1612,7 @@ static bConstraintTypeInfo CTI_LOCLIKE = {
|
||||
loclike_get_tars, /* get constraint targets */
|
||||
loclike_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
loclike_evaluate /* evaluate */
|
||||
loclike_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Copy Rotation ------------- */
|
||||
@@ -1724,7 +1724,7 @@ static bConstraintTypeInfo CTI_ROTLIKE = {
|
||||
rotlike_get_tars, /* get constraint targets */
|
||||
rotlike_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
rotlike_evaluate /* evaluate */
|
||||
rotlike_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ---------- Copy Scale ---------- */
|
||||
@@ -1819,7 +1819,7 @@ static bConstraintTypeInfo CTI_SIZELIKE = {
|
||||
sizelike_get_tars, /* get constraint targets */
|
||||
sizelike_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
sizelike_evaluate /* evaluate */
|
||||
sizelike_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Copy Transforms ------------- */
|
||||
@@ -1880,7 +1880,7 @@ static bConstraintTypeInfo CTI_TRANSLIKE = {
|
||||
translike_get_tars, /* get constraint targets */
|
||||
translike_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat_full_bbone, /* get target matrix */
|
||||
translike_evaluate /* evaluate */
|
||||
translike_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ---------- Maintain Volume ---------- */
|
||||
@@ -1937,7 +1937,7 @@ static bConstraintTypeInfo CTI_SAMEVOL = {
|
||||
NULL, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
NULL, /* get target matrix */
|
||||
samevolume_evaluate /* evaluate */
|
||||
samevolume_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Python Constraint -------------- */
|
||||
@@ -2057,7 +2057,7 @@ static bConstraintTypeInfo CTI_PYTHON = {
|
||||
pycon_get_tars, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
pycon_get_tarmat, /* get target matrix */
|
||||
pycon_evaluate /* evaluate */
|
||||
pycon_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Armature Constraint -------------- */
|
||||
@@ -2263,7 +2263,7 @@ static bConstraintTypeInfo CTI_ARMATURE = {
|
||||
armdef_get_tars, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
armdef_get_tarmat, /* get target matrix */
|
||||
armdef_evaluate /* evaluate */
|
||||
armdef_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* -------- Action Constraint ----------- */
|
||||
@@ -2427,7 +2427,7 @@ static bConstraintTypeInfo CTI_ACTION = {
|
||||
actcon_get_tars, /* get constraint targets */
|
||||
actcon_flush_tars, /* flush constraint targets */
|
||||
actcon_get_tarmat, /* get target matrix */
|
||||
actcon_evaluate /* evaluate */
|
||||
actcon_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* --------- Locked Track ---------- */
|
||||
@@ -2735,7 +2735,7 @@ static bConstraintTypeInfo CTI_LOCKTRACK = {
|
||||
locktrack_get_tars, /* get constraint targets */
|
||||
locktrack_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
locktrack_evaluate /* evaluate */
|
||||
locktrack_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ---------- Limit Distance Constraint ----------- */
|
||||
@@ -2869,7 +2869,7 @@ static bConstraintTypeInfo CTI_DISTLIMIT = {
|
||||
distlimit_get_tars, /* get constraint targets */
|
||||
distlimit_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get a target matrix */
|
||||
distlimit_evaluate /* evaluate */
|
||||
distlimit_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ---------- Stretch To ------------ */
|
||||
@@ -3081,7 +3081,7 @@ static bConstraintTypeInfo CTI_STRETCHTO = {
|
||||
stretchto_get_tars, /* get constraint targets */
|
||||
stretchto_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
stretchto_evaluate /* evaluate */
|
||||
stretchto_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ---------- Floor ------------ */
|
||||
@@ -3225,7 +3225,7 @@ static bConstraintTypeInfo CTI_MINMAX = {
|
||||
minmax_get_tars, /* get constraint targets */
|
||||
minmax_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
minmax_evaluate /* evaluate */
|
||||
minmax_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* -------- Clamp To ---------- */
|
||||
@@ -3391,7 +3391,7 @@ static bConstraintTypeInfo CTI_CLAMPTO = {
|
||||
clampto_get_tars, /* get constraint targets */
|
||||
clampto_flush_tars, /* flush constraint targets */
|
||||
clampto_get_tarmat, /* get target matrix */
|
||||
clampto_evaluate /* evaluate */
|
||||
clampto_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ---------- Transform Constraint ----------- */
|
||||
@@ -3554,7 +3554,7 @@ static bConstraintTypeInfo CTI_TRANSFORM = {
|
||||
transform_get_tars, /* get constraint targets */
|
||||
transform_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get a target matrix */
|
||||
transform_evaluate /* evaluate */
|
||||
transform_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ---------- Shrinkwrap Constraint ----------- */
|
||||
@@ -3767,7 +3767,7 @@ static bConstraintTypeInfo CTI_SHRINKWRAP = {
|
||||
shrinkwrap_get_tars, /* get constraint targets */
|
||||
shrinkwrap_flush_tars, /* flush constraint targets */
|
||||
shrinkwrap_get_tarmat, /* get a target matrix */
|
||||
shrinkwrap_evaluate /* evaluate */
|
||||
shrinkwrap_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* --------- Damped Track ---------- */
|
||||
@@ -3928,7 +3928,7 @@ static bConstraintTypeInfo CTI_DAMPTRACK = {
|
||||
damptrack_get_tars, /* get constraint targets */
|
||||
damptrack_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
damptrack_evaluate /* evaluate */
|
||||
damptrack_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Spline IK ------------ */
|
||||
@@ -4018,7 +4018,7 @@ static bConstraintTypeInfo CTI_SPLINEIK = {
|
||||
splineik_get_tars, /* get constraint targets */
|
||||
splineik_flush_tars, /* flush constraint targets */
|
||||
splineik_get_tarmat, /* get target matrix */
|
||||
NULL /* evaluate - solved as separate loop */
|
||||
NULL, /* evaluate - solved as separate loop */
|
||||
};
|
||||
|
||||
/* ----------- Pivot ------------- */
|
||||
@@ -4142,7 +4142,7 @@ static bConstraintTypeInfo CTI_PIVOT = {
|
||||
pivotcon_get_tars, /* get constraint targets */
|
||||
pivotcon_flush_tars, /* flush constraint targets */
|
||||
default_get_tarmat, /* get target matrix */
|
||||
pivotcon_evaluate /* evaluate */
|
||||
pivotcon_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Follow Track ------------- */
|
||||
@@ -4392,7 +4392,7 @@ static bConstraintTypeInfo CTI_FOLLOWTRACK = {
|
||||
NULL, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
NULL, /* get target matrix */
|
||||
followtrack_evaluate /* evaluate */
|
||||
followtrack_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Camre Solver ------------- */
|
||||
@@ -4449,7 +4449,7 @@ static bConstraintTypeInfo CTI_CAMERASOLVER = {
|
||||
NULL, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
NULL, /* get target matrix */
|
||||
camerasolver_evaluate /* evaluate */
|
||||
camerasolver_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Object Solver ------------- */
|
||||
@@ -4525,7 +4525,7 @@ static bConstraintTypeInfo CTI_OBJECTSOLVER = {
|
||||
NULL, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
NULL, /* get target matrix */
|
||||
objectsolver_evaluate /* evaluate */
|
||||
objectsolver_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ----------- Transform Cache ------------- */
|
||||
@@ -4616,7 +4616,7 @@ static bConstraintTypeInfo CTI_TRANSFORM_CACHE = {
|
||||
NULL, /* get constraint targets */
|
||||
NULL, /* flush constraint targets */
|
||||
NULL, /* get target matrix */
|
||||
transformcache_evaluate /* evaluate */
|
||||
transformcache_evaluate, /* evaluate */
|
||||
};
|
||||
|
||||
/* ************************* Constraints Type-Info *************************** */
|
||||
|
@@ -93,7 +93,7 @@ static FModifierTypeInfo FMI_MODNAME = {
|
||||
fcm_modname_time, /* evaluate time */
|
||||
fcm_modname_evaluate, /* evaluate */
|
||||
fcm_modname_time_storage, /* evaluate time with storage */
|
||||
fcm_modname_evaluate_storage /* evaluate with storage */
|
||||
fcm_modname_evaluate_storage, /* evaluate with storage */
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -246,7 +246,7 @@ static FModifierTypeInfo FMI_GENERATOR = {
|
||||
NULL, /* evaluate time */
|
||||
fcm_generator_evaluate, /* evaluate */
|
||||
NULL, /* evaluate time with storage */
|
||||
NULL /* evaluate with storage */
|
||||
NULL, /* evaluate with storage */
|
||||
};
|
||||
|
||||
/* Built-In Function Generator F-Curve Modifier --------------------------- */
|
||||
@@ -370,7 +370,7 @@ static FModifierTypeInfo FMI_FN_GENERATOR = {
|
||||
NULL, /* evaluate time */
|
||||
fcm_fn_generator_evaluate, /* evaluate */
|
||||
NULL, /* evaluate time with storage */
|
||||
NULL /* evaluate with storage */
|
||||
NULL, /* evaluate with storage */
|
||||
};
|
||||
|
||||
/* Envelope F-Curve Modifier --------------------------- */
|
||||
@@ -479,7 +479,7 @@ static FModifierTypeInfo FMI_ENVELOPE = {
|
||||
NULL, /* evaluate time */
|
||||
fcm_envelope_evaluate, /* evaluate */
|
||||
NULL, /* evaluate time with storage */
|
||||
NULL /* evaluate with storage */
|
||||
NULL, /* evaluate with storage */
|
||||
};
|
||||
|
||||
/* exported function for finding points */
|
||||
@@ -769,7 +769,7 @@ static FModifierTypeInfo FMI_CYCLES = {
|
||||
NULL, /* evaluate time */
|
||||
NULL, /* evaluate */
|
||||
fcm_cycles_time, /* evaluate time with storage */
|
||||
fcm_cycles_evaluate /* evaluate with storage */
|
||||
fcm_cycles_evaluate, /* evaluate with storage */
|
||||
};
|
||||
|
||||
/* Noise F-Curve Modifier --------------------------- */
|
||||
@@ -830,7 +830,7 @@ static FModifierTypeInfo FMI_NOISE = {
|
||||
NULL, /* evaluate time */
|
||||
fcm_noise_evaluate, /* evaluate */
|
||||
NULL, /* evaluate time with storage */
|
||||
NULL /* evaluate with storage */
|
||||
NULL, /* evaluate with storage */
|
||||
};
|
||||
|
||||
|
||||
@@ -887,7 +887,7 @@ static FModifierTypeInfo FMI_PYTHON = {
|
||||
NULL /*fcm_python_time*/, /* evaluate time */
|
||||
fcm_python_evaluate, /* evaluate */
|
||||
NULL, /* evaluate time with storage */
|
||||
NULL /* evaluate with storage */
|
||||
NULL, /* evaluate with storage */
|
||||
};
|
||||
|
||||
|
||||
@@ -932,7 +932,7 @@ static FModifierTypeInfo FMI_LIMITS = {
|
||||
fcm_limits_time, /* evaluate time */
|
||||
fcm_limits_evaluate, /* evaluate */
|
||||
NULL, /* evaluate time with storage */
|
||||
NULL /* evaluate with storage */
|
||||
NULL, /* evaluate with storage */
|
||||
};
|
||||
|
||||
/* Stepped F-Curve Modifier --------------------------- */
|
||||
@@ -987,7 +987,7 @@ static FModifierTypeInfo FMI_STEPPED = {
|
||||
fcm_stepped_time, /* evaluate time */
|
||||
NULL, /* evaluate */
|
||||
NULL, /* evaluate time with storage */
|
||||
NULL /* evaluate with storage */
|
||||
NULL, /* evaluate with storage */
|
||||
};
|
||||
|
||||
/* F-Curve Modifier API --------------------------- */
|
||||
|
@@ -2115,7 +2115,7 @@ static const char *stamp_metadata_fields[] = {
|
||||
"RenderTime",
|
||||
"Memory",
|
||||
"Hostname",
|
||||
NULL
|
||||
NULL,
|
||||
};
|
||||
|
||||
/* Check whether the given metadata field name translates to a known field of
|
||||
|
@@ -1986,7 +1986,7 @@ bool BKE_pbvh_node_find_nearest_to_ray(
|
||||
typedef enum {
|
||||
ISECT_INSIDE,
|
||||
ISECT_OUTSIDE,
|
||||
ISECT_INTERSECT
|
||||
ISECT_INTERSECT,
|
||||
} PlaneAABBIsect;
|
||||
|
||||
/* Adapted from:
|
||||
|
@@ -165,7 +165,7 @@ static SequenceModifierTypeInfo seqModifier_ColorBalance = {
|
||||
colorBalance_init_data, /* init_data */
|
||||
NULL, /* free_data */
|
||||
NULL, /* copy_data */
|
||||
colorBalance_apply /* apply */
|
||||
colorBalance_apply, /* apply */
|
||||
};
|
||||
|
||||
/* **** White Balance Modifier **** */
|
||||
@@ -252,7 +252,7 @@ static SequenceModifierTypeInfo seqModifier_WhiteBalance = {
|
||||
whiteBalance_init_data, /* init_data */
|
||||
NULL, /* free_data */
|
||||
NULL, /* copy_data */
|
||||
whiteBalance_apply /* apply */
|
||||
whiteBalance_apply, /* apply */
|
||||
};
|
||||
|
||||
/* **** Curves Modifier **** */
|
||||
@@ -361,7 +361,7 @@ static SequenceModifierTypeInfo seqModifier_Curves = {
|
||||
curves_init_data, /* init_data */
|
||||
curves_free_data, /* free_data */
|
||||
curves_copy_data, /* copy_data */
|
||||
curves_apply /* apply */
|
||||
curves_apply, /* apply */
|
||||
};
|
||||
|
||||
/* **** Hue Correct Modifier **** */
|
||||
@@ -469,7 +469,7 @@ static SequenceModifierTypeInfo seqModifier_HueCorrect = {
|
||||
hue_correct_init_data, /* init_data */
|
||||
hue_correct_free_data, /* free_data */
|
||||
hue_correct_copy_data, /* copy_data */
|
||||
hue_correct_apply /* apply */
|
||||
hue_correct_apply, /* apply */
|
||||
};
|
||||
|
||||
/* **** Bright/Contrast Modifier **** */
|
||||
@@ -566,7 +566,7 @@ static SequenceModifierTypeInfo seqModifier_BrightContrast = {
|
||||
NULL, /* init_data */
|
||||
NULL, /* free_data */
|
||||
NULL, /* copy_data */
|
||||
brightcontrast_apply /* apply */
|
||||
brightcontrast_apply, /* apply */
|
||||
};
|
||||
|
||||
/* **** Mask Modifier **** */
|
||||
@@ -627,7 +627,7 @@ static SequenceModifierTypeInfo seqModifier_Mask = {
|
||||
NULL, /* init_data */
|
||||
NULL, /* free_data */
|
||||
NULL, /* copy_data */
|
||||
maskmodifier_apply /* apply */
|
||||
maskmodifier_apply, /* apply */
|
||||
};
|
||||
|
||||
/* **** Tonemap Modifier **** */
|
||||
@@ -848,7 +848,7 @@ static SequenceModifierTypeInfo seqModifier_Tonemap = {
|
||||
tonemapmodifier_init_data, /* init_data */
|
||||
NULL, /* free_data */
|
||||
NULL, /* copy_data */
|
||||
tonemapmodifier_apply /* apply */
|
||||
tonemapmodifier_apply, /* apply */
|
||||
};
|
||||
|
||||
/*********************** Modifier functions *************************/
|
||||
|
@@ -53,7 +53,7 @@ typedef enum {
|
||||
BLI_CB_EVT_DEPSGRAPH_UPDATE_POST,
|
||||
BLI_CB_EVT_VERSION_UPDATE,
|
||||
BLI_CB_EVT_LOAD_FACTORY_STARTUP_POST,
|
||||
BLI_CB_EVT_TOT
|
||||
BLI_CB_EVT_TOT,
|
||||
} eCbEvent;
|
||||
|
||||
|
||||
|
@@ -169,7 +169,7 @@ typedef enum eEulerRotationOrders {
|
||||
EULER_ORDER_YXZ,
|
||||
EULER_ORDER_YZX,
|
||||
EULER_ORDER_ZXY,
|
||||
EULER_ORDER_ZYX
|
||||
EULER_ORDER_ZYX,
|
||||
/* there are 6 more entries with dulpicate entries included */
|
||||
} eEulerRotationOrders;
|
||||
|
||||
|
@@ -27,12 +27,12 @@
|
||||
typedef enum eStrCursorJumpType {
|
||||
STRCUR_JUMP_NONE,
|
||||
STRCUR_JUMP_DELIM,
|
||||
STRCUR_JUMP_ALL
|
||||
STRCUR_JUMP_ALL,
|
||||
} eStrCursorJumpType;
|
||||
|
||||
typedef enum eStrCursorJumpDirection {
|
||||
STRCUR_DIR_PREV,
|
||||
STRCUR_DIR_NEXT
|
||||
STRCUR_DIR_NEXT,
|
||||
} eStrCursorJumpDirection;
|
||||
|
||||
bool BLI_str_cursor_step_next_utf8(const char *str, size_t maxlen, int *pos);
|
||||
|
@@ -72,7 +72,7 @@ int BLI_task_scheduler_num_threads(TaskScheduler *scheduler);
|
||||
|
||||
typedef enum TaskPriority {
|
||||
TASK_PRIORITY_LOW,
|
||||
TASK_PRIORITY_HIGH
|
||||
TASK_PRIORITY_HIGH,
|
||||
} TaskPriority;
|
||||
|
||||
typedef struct TaskPool TaskPool;
|
||||
|
@@ -172,7 +172,7 @@ static bCallbackFuncStore load_pre_callback = {
|
||||
NULL, NULL, /* next, prev */
|
||||
remove_non_persistent_functions, /* func */
|
||||
NULL, /* arg */
|
||||
0 /* alloc */
|
||||
0, /* alloc */
|
||||
};
|
||||
|
||||
static void ensure_callback_is_registered()
|
||||
|
@@ -41,7 +41,7 @@ typedef enum eStrCursorDelimType {
|
||||
STRCUR_DELIM_OPERATOR,
|
||||
STRCUR_DELIM_QUOTE,
|
||||
STRCUR_DELIM_WHITESPACE,
|
||||
STRCUR_DELIM_OTHER
|
||||
STRCUR_DELIM_OTHER,
|
||||
} eStrCursorDelimType;
|
||||
|
||||
static eStrCursorDelimType cursor_delim_type_unicode(const uint uch)
|
||||
|
@@ -44,7 +44,7 @@ const char bm_iter_itype_htype_map[BM_ITYPE_MAX] = {
|
||||
BM_EDGE, /* BM_EDGES_OF_FACE */
|
||||
BM_LOOP, /* BM_LOOPS_OF_FACE */
|
||||
BM_LOOP, /* BM_LOOPS_OF_LOOP */
|
||||
BM_LOOP /* BM_LOOPS_OF_EDGE */
|
||||
BM_LOOP, /* BM_LOOPS_OF_EDGE */
|
||||
};
|
||||
|
||||
/**
|
||||
|
@@ -78,7 +78,7 @@ enum {
|
||||
BM_EDGEROT_CHECK_EXISTS = (1 << 0), /* disallow to rotate when the new edge matches an existing one */
|
||||
BM_EDGEROT_CHECK_SPLICE = (1 << 1), /* overrides existing check, if the edge already, rotate and merge them */
|
||||
BM_EDGEROT_CHECK_DEGENERATE = (1 << 2), /* disallow creating bow-tie, concave or zero area faces */
|
||||
BM_EDGEROT_CHECK_BEAUTY = (1 << 3) /* disallow to rotate into ugly topology */
|
||||
BM_EDGEROT_CHECK_BEAUTY = (1 << 3), /* disallow to rotate into ugly topology */
|
||||
};
|
||||
|
||||
|
||||
|
@@ -68,7 +68,7 @@ const int BMO_OPSLOT_TYPEINFO[BMO_OP_SLOT_TOTAL_TYPES] = {
|
||||
0, /* 7: unused */
|
||||
sizeof(float) * 3, /* 8: BMO_OP_SLOT_VEC */
|
||||
sizeof(void *), /* 9: BMO_OP_SLOT_ELEMENT_BUF */
|
||||
sizeof(void *) /* 10: BMO_OP_SLOT_MAPPING */
|
||||
sizeof(void *), /* 10: BMO_OP_SLOT_MAPPING */
|
||||
};
|
||||
|
||||
/* Dummy slot so there is something to return when slot name lookup fails */
|
||||
|
@@ -27,7 +27,7 @@
|
||||
|
||||
typedef enum {
|
||||
BMW_DEPTH_FIRST,
|
||||
BMW_BREADTH_FIRST
|
||||
BMW_BREADTH_FIRST,
|
||||
} BMWOrder;
|
||||
|
||||
typedef enum {
|
||||
|
@@ -84,7 +84,7 @@ struct Depsgraph;
|
||||
typedef enum BC_animation_source_type {
|
||||
BC_SOURCE_TYPE_VALUE,
|
||||
BC_SOURCE_TYPE_ANGLE,
|
||||
BC_SOURCE_TYPE_TIMEFRAME
|
||||
BC_SOURCE_TYPE_TIMEFRAME,
|
||||
} BC_animation_source_type;
|
||||
|
||||
class AnimationExporter: COLLADASW::LibraryAnimations
|
||||
|
@@ -47,7 +47,7 @@ typedef enum BC_animation_type {
|
||||
BC_ANIMATION_TYPE_BONE,
|
||||
BC_ANIMATION_TYPE_CAMERA,
|
||||
BC_ANIMATION_TYPE_MATERIAL,
|
||||
BC_ANIMATION_TYPE_LIGHT
|
||||
BC_ANIMATION_TYPE_LIGHT,
|
||||
} BC_animation_type;
|
||||
|
||||
class BCCurveKey {
|
||||
|
@@ -29,18 +29,18 @@ extern "C" {
|
||||
|
||||
typedef enum BC_export_mesh_type {
|
||||
BC_MESH_TYPE_VIEW,
|
||||
BC_MESH_TYPE_RENDER
|
||||
BC_MESH_TYPE_RENDER,
|
||||
} BC_export_mesh_type;
|
||||
|
||||
typedef enum BC_export_transformation_type {
|
||||
BC_TRANSFORMATION_TYPE_MATRIX,
|
||||
BC_TRANSFORMATION_TYPE_TRANSROTLOC
|
||||
BC_TRANSFORMATION_TYPE_TRANSROTLOC,
|
||||
} BC_export_transformation_type;
|
||||
|
||||
|
||||
typedef enum BC_export_animation_type {
|
||||
BC_ANIMATION_EXPORT_SAMPLES,
|
||||
BC_ANIMATION_EXPORT_KEYS
|
||||
BC_ANIMATION_EXPORT_KEYS,
|
||||
} BC_export_animation_type;
|
||||
|
||||
typedef enum BC_ui_export_section {
|
||||
@@ -48,7 +48,7 @@ typedef enum BC_ui_export_section {
|
||||
BC_UI_SECTION_GEOMETRY,
|
||||
BC_UI_SECTION_ARMATURE,
|
||||
BC_UI_SECTION_ANIMATION,
|
||||
BC_UI_SECTION_COLLADA
|
||||
BC_UI_SECTION_COLLADA,
|
||||
} BC_ui_export_section;
|
||||
|
||||
typedef struct ExportSettings {
|
||||
|
@@ -49,6 +49,7 @@ ImagesExporter::ImagesExporter(COLLADASW::StreamWriter *sw, const ExportSettings
|
||||
export_settings(export_settings),
|
||||
key_image_map(key_image_map)
|
||||
{
|
||||
/* pass */
|
||||
}
|
||||
|
||||
void ImagesExporter::export_UV_Image(Image *image, bool use_copies)
|
||||
|
@@ -205,7 +205,9 @@ MeshImporter::MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Main
|
||||
m_bmain(bmain),
|
||||
scene(sce),
|
||||
view_layer(view_layer),
|
||||
armature_importer(arm) {
|
||||
armature_importer(arm)
|
||||
{
|
||||
/* pass */
|
||||
}
|
||||
|
||||
bool MeshImporter::set_poly_indices(MPoly *mpoly, MLoop *mloop, int loop_index, unsigned int *indices, int loop_count)
|
||||
|
@@ -46,7 +46,7 @@ typedef enum MemoryBufferState {
|
||||
typedef enum MemoryBufferExtend {
|
||||
COM_MB_CLIP,
|
||||
COM_MB_EXTEND,
|
||||
COM_MB_REPEAT
|
||||
COM_MB_REPEAT,
|
||||
} MemoryBufferExtend;
|
||||
|
||||
class MemoryProxy;
|
||||
|
@@ -25,7 +25,7 @@ typedef enum MovieClipAttribute {
|
||||
MCA_SCALE,
|
||||
MCA_X,
|
||||
MCA_Y,
|
||||
MCA_ANGLE
|
||||
MCA_ANGLE,
|
||||
} MovieClipAttribute;
|
||||
/**
|
||||
* this program converts an input color to an output value.
|
||||
|
@@ -22,7 +22,7 @@
|
||||
|
||||
typedef enum QualityHelper {
|
||||
COM_QH_INCREASE,
|
||||
COM_QH_MULTIPLY
|
||||
COM_QH_MULTIPLY,
|
||||
} QualityHelper;
|
||||
|
||||
class QualityStepHelper {
|
||||
|
@@ -99,7 +99,7 @@ typedef char DRWViewportEmptyList;
|
||||
DRW_VIEWPORT_LIST_SIZE(*(((ty *)NULL)->fbl)), \
|
||||
DRW_VIEWPORT_LIST_SIZE(*(((ty *)NULL)->txl)), \
|
||||
DRW_VIEWPORT_LIST_SIZE(*(((ty *)NULL)->psl)), \
|
||||
DRW_VIEWPORT_LIST_SIZE(*(((ty *)NULL)->stl)) \
|
||||
DRW_VIEWPORT_LIST_SIZE(*(((ty *)NULL)->stl)), \
|
||||
}
|
||||
|
||||
/* Use of multisample framebuffers. */
|
||||
|
@@ -509,7 +509,7 @@ enum {
|
||||
|
||||
PCHAN_COLOR_SPHEREBONE_BASE, /* for the 'stick' of sphere (envelope) bones */
|
||||
PCHAN_COLOR_SPHEREBONE_END, /* for the ends of sphere (envelope) bones */
|
||||
PCHAN_COLOR_LINEBONE /* for the middle of line-bones */
|
||||
PCHAN_COLOR_LINEBONE, /* for the middle of line-bones */
|
||||
};
|
||||
|
||||
/* This function sets the color-set for coloring a certain bone */
|
||||
|
@@ -191,7 +191,7 @@ typedef enum {
|
||||
DRW_UNIFORM_TEXTURE_PERSIST,
|
||||
DRW_UNIFORM_TEXTURE_REF,
|
||||
DRW_UNIFORM_BLOCK,
|
||||
DRW_UNIFORM_BLOCK_PERSIST
|
||||
DRW_UNIFORM_BLOCK_PERSIST,
|
||||
} DRWUniformType;
|
||||
|
||||
struct DRWUniform {
|
||||
|
@@ -530,7 +530,7 @@ static bAnimChannelType ACF_SUMMARY =
|
||||
|
||||
acf_summary_setting_valid, /* has setting */
|
||||
acf_summary_setting_flag, /* flag for setting */
|
||||
acf_summary_setting_ptr /* pointer for setting */
|
||||
acf_summary_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Scene ------------------------------------------- */
|
||||
@@ -635,7 +635,7 @@ static bAnimChannelType ACF_SCENE =
|
||||
|
||||
acf_scene_setting_valid, /* has setting */
|
||||
acf_scene_setting_flag, /* flag for setting */
|
||||
acf_scene_setting_ptr /* pointer for setting */
|
||||
acf_scene_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Object ------------------------------------------- */
|
||||
@@ -800,7 +800,7 @@ static bAnimChannelType ACF_OBJECT =
|
||||
|
||||
acf_object_setting_valid, /* has setting */
|
||||
acf_object_setting_flag, /* flag for setting */
|
||||
acf_object_setting_ptr /* pointer for setting */
|
||||
acf_object_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Group ------------------------------------------- */
|
||||
@@ -959,7 +959,7 @@ static bAnimChannelType ACF_GROUP =
|
||||
|
||||
acf_group_setting_valid, /* has setting */
|
||||
acf_group_setting_flag, /* flag for setting */
|
||||
acf_group_setting_ptr /* pointer for setting */
|
||||
acf_group_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* F-Curve ------------------------------------------- */
|
||||
@@ -1076,7 +1076,7 @@ static bAnimChannelType ACF_FCURVE =
|
||||
|
||||
acf_fcurve_setting_valid, /* has setting */
|
||||
acf_fcurve_setting_flag, /* flag for setting */
|
||||
acf_fcurve_setting_ptr /* pointer for setting */
|
||||
acf_fcurve_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* NLA Control FCurves Expander ----------------------- */
|
||||
@@ -1175,7 +1175,7 @@ static bAnimChannelType ACF_NLACONTROLS =
|
||||
|
||||
acf_nla_controls_setting_valid, /* has setting */
|
||||
acf_nla_controls_setting_flag, /* flag for setting */
|
||||
acf_nla_controls_setting_ptr /* pointer for setting */
|
||||
acf_nla_controls_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
|
||||
@@ -1218,7 +1218,7 @@ static bAnimChannelType ACF_NLACURVE =
|
||||
|
||||
acf_fcurve_setting_valid, /* has setting */
|
||||
acf_fcurve_setting_flag, /* flag for setting */
|
||||
acf_fcurve_setting_ptr /* pointer for setting */
|
||||
acf_fcurve_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Object Action Expander ------------------------------------------- */
|
||||
@@ -1303,7 +1303,7 @@ static bAnimChannelType ACF_FILLACTD =
|
||||
|
||||
acf_fillactd_setting_valid, /* has setting */
|
||||
acf_fillactd_setting_flag, /* flag for setting */
|
||||
acf_fillactd_setting_ptr /* pointer for setting */
|
||||
acf_fillactd_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Drivers Expander ------------------------------------------- */
|
||||
@@ -1383,7 +1383,7 @@ static bAnimChannelType ACF_FILLDRIVERS =
|
||||
|
||||
acf_filldrivers_setting_valid, /* has setting */
|
||||
acf_filldrivers_setting_flag, /* flag for setting */
|
||||
acf_filldrivers_setting_ptr /* pointer for setting */
|
||||
acf_filldrivers_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
|
||||
@@ -1461,7 +1461,7 @@ static bAnimChannelType ACF_DSMAT =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsmat_setting_flag, /* flag for setting */
|
||||
acf_dsmat_setting_ptr /* pointer for setting */
|
||||
acf_dsmat_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Light Expander ------------------------------------------- */
|
||||
@@ -1538,7 +1538,7 @@ static bAnimChannelType ACF_DSLIGHT =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dslight_setting_flag, /* flag for setting */
|
||||
acf_dslight_setting_ptr /* pointer for setting */
|
||||
acf_dslight_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Texture Expander ------------------------------------------- */
|
||||
@@ -1622,7 +1622,7 @@ static bAnimChannelType ACF_DSTEX =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dstex_setting_flag, /* flag for setting */
|
||||
acf_dstex_setting_ptr /* pointer for setting */
|
||||
acf_dstex_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Camera Expander ------------------------------------------- */
|
||||
@@ -1704,7 +1704,7 @@ static bAnimChannelType ACF_DSCACHEFILE =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dscachefile_setting_flag, /* flag for setting */
|
||||
acf_dscachefile_setting_ptr /* pointer for setting */
|
||||
acf_dscachefile_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Camera Expander ------------------------------------------- */
|
||||
@@ -1785,7 +1785,7 @@ static bAnimChannelType ACF_DSCAM =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dscam_setting_flag, /* flag for setting */
|
||||
acf_dscam_setting_ptr /* pointer for setting */
|
||||
acf_dscam_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Curve Expander ------------------------------------------- */
|
||||
@@ -1872,7 +1872,7 @@ static bAnimChannelType ACF_DSCUR =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dscur_setting_flag, /* flag for setting */
|
||||
acf_dscur_setting_ptr /* pointer for setting */
|
||||
acf_dscur_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Shape Key Expander ------------------------------------------- */
|
||||
@@ -1949,7 +1949,7 @@ static bAnimChannelType ACF_DSSKEY =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsskey_setting_flag, /* flag for setting */
|
||||
acf_dsskey_setting_ptr /* pointer for setting */
|
||||
acf_dsskey_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* World Expander ------------------------------------------- */
|
||||
@@ -2026,7 +2026,7 @@ static bAnimChannelType ACF_DSWOR =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dswor_setting_flag, /* flag for setting */
|
||||
acf_dswor_setting_ptr /* pointer for setting */
|
||||
acf_dswor_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Particle Expander ------------------------------------------- */
|
||||
@@ -2103,7 +2103,7 @@ static bAnimChannelType ACF_DSPART =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dspart_setting_flag, /* flag for setting */
|
||||
acf_dspart_setting_ptr /* pointer for setting */
|
||||
acf_dspart_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* MetaBall Expander ------------------------------------------- */
|
||||
@@ -2180,7 +2180,7 @@ static bAnimChannelType ACF_DSMBALL =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsmball_setting_flag, /* flag for setting */
|
||||
acf_dsmball_setting_ptr /* pointer for setting */
|
||||
acf_dsmball_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Armature Expander ------------------------------------------- */
|
||||
@@ -2257,7 +2257,7 @@ static bAnimChannelType ACF_DSARM =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsarm_setting_flag, /* flag for setting */
|
||||
acf_dsarm_setting_ptr /* pointer for setting */
|
||||
acf_dsarm_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* NodeTree Expander ------------------------------------------- */
|
||||
@@ -2345,7 +2345,7 @@ static bAnimChannelType ACF_DSNTREE =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsntree_setting_flag, /* flag for setting */
|
||||
acf_dsntree_setting_ptr /* pointer for setting */
|
||||
acf_dsntree_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* LineStyle Expander ------------------------------------------- */
|
||||
@@ -2422,7 +2422,7 @@ static bAnimChannelType ACF_DSLINESTYLE =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dslinestyle_setting_flag, /* flag for setting */
|
||||
acf_dslinestyle_setting_ptr /* pointer for setting */
|
||||
acf_dslinestyle_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Mesh Expander ------------------------------------------- */
|
||||
@@ -2499,7 +2499,7 @@ static bAnimChannelType ACF_DSMESH =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsmesh_setting_flag, /* flag for setting */
|
||||
acf_dsmesh_setting_ptr /* pointer for setting */
|
||||
acf_dsmesh_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Lattice Expander ------------------------------------------- */
|
||||
@@ -2576,7 +2576,7 @@ static bAnimChannelType ACF_DSLAT =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dslat_setting_flag, /* flag for setting */
|
||||
acf_dslat_setting_ptr /* pointer for setting */
|
||||
acf_dslat_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Speaker Expander ------------------------------------------- */
|
||||
@@ -2653,7 +2653,7 @@ static bAnimChannelType ACF_DSSPK =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsspk_setting_flag, /* flag for setting */
|
||||
acf_dsspk_setting_ptr /* pointer for setting */
|
||||
acf_dsspk_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* GPencil Expander ------------------------------------------- */
|
||||
@@ -2730,7 +2730,7 @@ static bAnimChannelType ACF_DSGPENCIL =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsgpencil_setting_flag, /* flag for setting */
|
||||
acf_dsgpencil_setting_ptr /* pointer for setting */
|
||||
acf_dsgpencil_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* World Expander ------------------------------------------- */
|
||||
@@ -2808,7 +2808,7 @@ static bAnimChannelType ACF_DSMCLIP =
|
||||
|
||||
acf_generic_dataexpand_setting_valid, /* has setting */
|
||||
acf_dsmclip_setting_flag, /* flag for setting */
|
||||
acf_dsmclip_setting_ptr /* pointer for setting */
|
||||
acf_dsmclip_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* ShapeKey Entry ------------------------------------------- */
|
||||
@@ -2916,7 +2916,7 @@ static bAnimChannelType ACF_SHAPEKEY =
|
||||
|
||||
acf_shapekey_setting_valid, /* has setting */
|
||||
acf_shapekey_setting_flag, /* flag for setting */
|
||||
acf_shapekey_setting_ptr /* pointer for setting */
|
||||
acf_shapekey_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* GPencil Datablock ------------------------------------------- */
|
||||
@@ -2993,7 +2993,7 @@ static bAnimChannelType ACF_GPD =
|
||||
|
||||
acf_gpd_setting_valid, /* has setting */
|
||||
acf_gpd_setting_flag, /* flag for setting */
|
||||
acf_gpd_setting_ptr /* pointer for setting */
|
||||
acf_gpd_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* GPencil Layer ------------------------------------------- */
|
||||
@@ -3086,7 +3086,7 @@ static bAnimChannelType ACF_GPL =
|
||||
|
||||
acf_gpl_setting_valid, /* has setting */
|
||||
acf_gpl_setting_flag, /* flag for setting */
|
||||
acf_gpl_setting_ptr /* pointer for setting */
|
||||
acf_gpl_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
|
||||
@@ -3164,7 +3164,7 @@ static bAnimChannelType ACF_MASKDATA =
|
||||
|
||||
acf_mask_setting_valid, /* has setting */
|
||||
acf_mask_setting_flag, /* flag for setting */
|
||||
acf_mask_setting_ptr /* pointer for setting */
|
||||
acf_mask_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* Mask Layer ------------------------------------------- */
|
||||
@@ -3251,7 +3251,7 @@ static bAnimChannelType ACF_MASKLAYER =
|
||||
|
||||
acf_masklay_setting_valid, /* has setting */
|
||||
acf_masklay_setting_flag, /* flag for setting */
|
||||
acf_masklay_setting_ptr /* pointer for setting */
|
||||
acf_masklay_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* NLA Track ----------------------------------------------- */
|
||||
@@ -3390,7 +3390,7 @@ static bAnimChannelType ACF_NLATRACK =
|
||||
|
||||
acf_nlatrack_setting_valid, /* has setting */
|
||||
acf_nlatrack_setting_flag, /* flag for setting */
|
||||
acf_nlatrack_setting_ptr /* pointer for setting */
|
||||
acf_nlatrack_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
/* NLA Action ----------------------------------------------- */
|
||||
@@ -3556,7 +3556,7 @@ static bAnimChannelType ACF_NLAACTION =
|
||||
|
||||
acf_nlaaction_setting_valid, /* has setting */
|
||||
acf_nlaaction_setting_flag, /* flag for setting */
|
||||
acf_nlaaction_setting_ptr /* pointer for setting */
|
||||
acf_nlaaction_setting_ptr, /* pointer for setting */
|
||||
};
|
||||
|
||||
|
||||
|
@@ -564,7 +564,7 @@ enum {
|
||||
KEYNEEDED_DONTADD = 0,
|
||||
KEYNEEDED_JUSTADD,
|
||||
KEYNEEDED_DELPREV,
|
||||
KEYNEEDED_DELNEXT
|
||||
KEYNEEDED_DELNEXT,
|
||||
} /*eKeyNeededStatus*/;
|
||||
|
||||
/* This helper function determines whether a new keyframe is needed */
|
||||
|
@@ -147,7 +147,7 @@ typedef enum ePoseSlide_Channels {
|
||||
|
||||
PS_TFM_BBONE_SHAPE, /* Bendy Bones */
|
||||
|
||||
PS_TFM_PROPS /* Custom Properties */
|
||||
PS_TFM_PROPS, /* Custom Properties */
|
||||
} ePoseSlide_Channels;
|
||||
|
||||
/* Property enum for ePoseSlide_Channels */
|
||||
@@ -1344,7 +1344,7 @@ typedef enum ePosePropagate_Termination {
|
||||
/* only do on keyframes that are selected */
|
||||
POSE_PROPAGATE_SELECTED_KEYS,
|
||||
/* only do on the frames where markers are selected */
|
||||
POSE_PROPAGATE_SELECTED_MARKERS
|
||||
POSE_PROPAGATE_SELECTED_MARKERS,
|
||||
} ePosePropagate_Termination;
|
||||
|
||||
/* termination data needed for some modes - assumes only one of these entries will be needed at a time */
|
||||
|
@@ -93,7 +93,7 @@ typedef enum eGP_StrokeAdd_Result {
|
||||
GP_STROKEADD_INVALID = -2, /* error occurred - insufficient info to do so */
|
||||
GP_STROKEADD_OVERFLOW = -1, /* error occurred - cannot fit any more points */
|
||||
GP_STROKEADD_NORMAL, /* point was successfully added */
|
||||
GP_STROKEADD_FULL /* cannot add any more points to buffer */
|
||||
GP_STROKEADD_FULL, /* cannot add any more points to buffer */
|
||||
} eGP_StrokeAdd_Result;
|
||||
|
||||
/* Runtime flags */
|
||||
|
@@ -356,7 +356,7 @@ typedef enum eGPencil_PaintModes {
|
||||
GP_PAINTMODE_ERASER,
|
||||
GP_PAINTMODE_DRAW_STRAIGHT,
|
||||
GP_PAINTMODE_DRAW_POLY,
|
||||
GP_PAINTMODE_SET_CP
|
||||
GP_PAINTMODE_SET_CP,
|
||||
} eGPencil_PaintModes;
|
||||
|
||||
/* maximum sizes of gp-session buffer */
|
||||
@@ -548,7 +548,7 @@ typedef enum ACTFILTER_FLAGS {
|
||||
ACTFILTER_IPOKEYS = (1 << 4), /* only channels referencing ipo's */
|
||||
ACTFILTER_ONLYICU = (1 << 5), /* only reference ipo-curves */
|
||||
ACTFILTER_FORDRAWING = (1 << 6), /* make list for interface drawing */
|
||||
ACTFILTER_ACTGROUPED = (1 << 7) /* belongs to the active group */
|
||||
ACTFILTER_ACTGROUPED = (1 << 7), /* belongs to the active group */
|
||||
} ACTFILTER_FLAGS;
|
||||
|
||||
/* Action Editor - Main Data types */
|
||||
@@ -556,7 +556,7 @@ typedef enum ACTCONT_TYPES {
|
||||
ACTCONT_NONE = 0,
|
||||
ACTCONT_ACTION,
|
||||
ACTCONT_SHAPEKEY,
|
||||
ACTCONT_GPENCIL
|
||||
ACTCONT_GPENCIL,
|
||||
} ACTCONT_TYPES;
|
||||
|
||||
/* ****************************************************** */
|
||||
|
@@ -93,7 +93,7 @@ typedef enum eGPencil_PaintStatus {
|
||||
GP_STATUS_IDLING = 0, /* stroke isn't in progress yet */
|
||||
GP_STATUS_PAINTING, /* a stroke is in progress */
|
||||
GP_STATUS_ERROR, /* something wasn't correctly set up */
|
||||
GP_STATUS_DONE /* painting done */
|
||||
GP_STATUS_DONE, /* painting done */
|
||||
} eGPencil_PaintStatus;
|
||||
|
||||
/* Return flags for adding points to stroke buffer */
|
||||
@@ -101,7 +101,7 @@ typedef enum eGP_StrokeAdd_Result {
|
||||
GP_STROKEADD_INVALID = -2, /* error occurred - insufficient info to do so */
|
||||
GP_STROKEADD_OVERFLOW = -1, /* error occurred - cannot fit any more points */
|
||||
GP_STROKEADD_NORMAL, /* point was successfully added */
|
||||
GP_STROKEADD_FULL /* cannot add any more points to buffer */
|
||||
GP_STROKEADD_FULL, /* cannot add any more points to buffer */
|
||||
} eGP_StrokeAdd_Result;
|
||||
|
||||
/* Runtime flags */
|
||||
|
@@ -240,7 +240,7 @@ typedef enum eAnim_ChannelType {
|
||||
ANIMTYPE_PALETTE,
|
||||
|
||||
/* always as last item, the total number of channel types... */
|
||||
ANIMTYPE_NUM_TYPES
|
||||
ANIMTYPE_NUM_TYPES,
|
||||
} eAnim_ChannelType;
|
||||
|
||||
/* types of keyframe data in bAnimListElem */
|
||||
@@ -255,7 +255,7 @@ typedef enum eAnim_KeyType {
|
||||
ALE_SCE, /* Scene summary */
|
||||
ALE_OB, /* Object summary */
|
||||
ALE_ACT, /* Action summary */
|
||||
ALE_GROUP /* Action Group summary */
|
||||
ALE_GROUP, /* Action Group summary */
|
||||
} eAnim_KeyType;
|
||||
|
||||
/* Flags for specifying the types of updates (i.e. recalculation/refreshing) that
|
||||
|
@@ -121,7 +121,7 @@ typedef enum FSMenuCategory {
|
||||
FS_CATEGORY_SYSTEM,
|
||||
FS_CATEGORY_SYSTEM_BOOKMARKS,
|
||||
FS_CATEGORY_BOOKMARKS,
|
||||
FS_CATEGORY_RECENT
|
||||
FS_CATEGORY_RECENT,
|
||||
} FSMenuCategory;
|
||||
|
||||
typedef enum FSMenuInsert {
|
||||
|
@@ -104,7 +104,7 @@ typedef enum eKeyframeShapeDrawOpts {
|
||||
/* only the inside filling */
|
||||
KEYFRAME_SHAPE_INSIDE,
|
||||
/* the whole thing */
|
||||
KEYFRAME_SHAPE_BOTH
|
||||
KEYFRAME_SHAPE_BOTH,
|
||||
} eKeyframeShapeDrawOpts;
|
||||
|
||||
/* Handle type. */
|
||||
|
@@ -72,7 +72,7 @@ typedef enum eEditKeyframes_Select {
|
||||
/* "selection map" building modes */
|
||||
typedef enum eEditKeyframes_SelMap {
|
||||
SELMAP_MORE = 0,
|
||||
SELMAP_LESS
|
||||
SELMAP_LESS,
|
||||
} eEditKeyframes_SelMap;
|
||||
|
||||
/* snapping tools */
|
||||
@@ -199,7 +199,7 @@ typedef enum eKeyPasteOffset {
|
||||
/* paste keys relative to the current frame when copying */
|
||||
KEYFRAME_PASTE_OFFSET_CFRA_RELATIVE,
|
||||
/* paste keys from original time */
|
||||
KEYFRAME_PASTE_OFFSET_NONE
|
||||
KEYFRAME_PASTE_OFFSET_NONE,
|
||||
} eKeyPasteOffset;
|
||||
|
||||
typedef enum eKeyMergeMode {
|
||||
@@ -210,7 +210,7 @@ typedef enum eKeyMergeMode {
|
||||
/* overwrite keys in pasted range */
|
||||
KEYFRAME_PASTE_MERGE_OVER_RANGE,
|
||||
/* overwrite keys in pasted range (use all keyframe start & end for range) */
|
||||
KEYFRAME_PASTE_MERGE_OVER_RANGE_ALL
|
||||
KEYFRAME_PASTE_MERGE_OVER_RANGE_ALL,
|
||||
} eKeyMergeMode;
|
||||
|
||||
/* ---------------- Looping API --------------------- */
|
||||
|
@@ -81,7 +81,7 @@ typedef enum {
|
||||
AE_TOP_TO_BOTTOMRIGHT,
|
||||
/** Region located at the top, _bottom_ edge is action zone.
|
||||
* Region minimized to the top left */
|
||||
AE_BOTTOM_TO_TOPLEFT
|
||||
AE_BOTTOM_TO_TOPLEFT,
|
||||
} AZEdge;
|
||||
|
||||
typedef enum {
|
||||
|
@@ -49,7 +49,7 @@ bool ED_transverts_poll(struct bContext *C);
|
||||
enum {
|
||||
TM_INDEX_ON = 1, /* tag to make trans verts */
|
||||
TM_INDEX_OFF = 0, /* don't make verts */
|
||||
TM_INDEX_SKIP = -1 /* dont make verts (when the index values point to trans-verts) */
|
||||
TM_INDEX_SKIP = -1, /* dont make verts (when the index values point to trans-verts) */
|
||||
};
|
||||
|
||||
/* mode flags: */
|
||||
|
@@ -292,7 +292,7 @@ typedef enum {
|
||||
UI_BUT_POIN_INT = 96,
|
||||
UI_BUT_POIN_FLOAT = 128,
|
||||
/* UI_BUT_POIN_FUNCTION = 192, */ /*UNUSED*/
|
||||
UI_BUT_POIN_BIT = 256 /* OR'd with a bit index*/
|
||||
UI_BUT_POIN_BIT = 256, /* OR'd with a bit index*/
|
||||
} eButPointerType;
|
||||
|
||||
/* requires (but->poin != NULL) */
|
||||
|
@@ -35,7 +35,7 @@
|
||||
typedef enum {
|
||||
/* ui */
|
||||
#include "UI_icons.h"
|
||||
BIFICONID_LAST
|
||||
BIFICONID_LAST,
|
||||
} BIFIconID;
|
||||
|
||||
#define BIFICONID_FIRST (ICON_NONE)
|
||||
@@ -310,7 +310,7 @@ typedef enum ThemeColorID {
|
||||
TH_METADATA_TEXT,
|
||||
|
||||
TH_EDGE_BEVEL,
|
||||
TH_VERTEX_BEVEL
|
||||
TH_VERTEX_BEVEL,
|
||||
} ThemeColorID;
|
||||
|
||||
/* specific defines per space should have higher define values */
|
||||
|
@@ -133,7 +133,7 @@ typedef enum uiButtonActivateType {
|
||||
BUTTON_ACTIVATE,
|
||||
BUTTON_ACTIVATE_APPLY,
|
||||
BUTTON_ACTIVATE_TEXT_EDITING,
|
||||
BUTTON_ACTIVATE_OPEN
|
||||
BUTTON_ACTIVATE_OPEN,
|
||||
} uiButtonActivateType;
|
||||
|
||||
typedef enum uiHandleButtonState {
|
||||
@@ -147,7 +147,7 @@ typedef enum uiHandleButtonState {
|
||||
BUTTON_STATE_TEXT_SELECTING,
|
||||
BUTTON_STATE_MENU_OPEN,
|
||||
BUTTON_STATE_WAIT_DRAG,
|
||||
BUTTON_STATE_EXIT
|
||||
BUTTON_STATE_EXIT,
|
||||
} uiHandleButtonState;
|
||||
|
||||
|
||||
|
@@ -118,7 +118,7 @@ typedef enum uiItemType {
|
||||
TEMPLATE_BOX,
|
||||
|
||||
TEMPLATE_HEADER,
|
||||
TEMPLATE_HEADER_ID
|
||||
TEMPLATE_HEADER_ID,
|
||||
#endif
|
||||
} uiItemType;
|
||||
|
||||
|
@@ -90,7 +90,7 @@ typedef enum uiHandlePanelState {
|
||||
PANEL_STATE_DRAG_SCALE,
|
||||
PANEL_STATE_WAIT_UNTAB,
|
||||
PANEL_STATE_ANIMATION,
|
||||
PANEL_STATE_EXIT
|
||||
PANEL_STATE_EXIT,
|
||||
} uiHandlePanelState;
|
||||
|
||||
typedef struct uiHandlePanelData {
|
||||
|
@@ -1698,7 +1698,7 @@ enum {
|
||||
SCROLLHANDLE_BAR,
|
||||
SCROLLHANDLE_MAX,
|
||||
SCROLLHANDLE_MIN_OUTSIDE,
|
||||
SCROLLHANDLE_MAX_OUTSIDE
|
||||
SCROLLHANDLE_MAX_OUTSIDE,
|
||||
} /*eV2DScrollerHandle_Zone*/;
|
||||
|
||||
/* ------------------------ */
|
||||
|
@@ -1610,7 +1610,7 @@ void OBJECT_OT_skin_root_mark(wmOperatorType *ot)
|
||||
|
||||
typedef enum {
|
||||
SKIN_LOOSE_MARK,
|
||||
SKIN_LOOSE_CLEAR
|
||||
SKIN_LOOSE_CLEAR,
|
||||
} SkinLooseAction;
|
||||
|
||||
static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op)
|
||||
|
@@ -440,7 +440,7 @@ void OBJECT_OT_proxy_make(wmOperatorType *ot)
|
||||
typedef enum eObClearParentTypes {
|
||||
CLEAR_PARENT_ALL = 0,
|
||||
CLEAR_PARENT_KEEP_TRANSFORM,
|
||||
CLEAR_PARENT_INVERSE
|
||||
CLEAR_PARENT_INVERSE,
|
||||
} eObClearParentTypes;
|
||||
|
||||
EnumPropertyItem prop_clear_parent_types[] = {
|
||||
|
@@ -315,7 +315,7 @@ static bool image_paint_2d_clone_poll(bContext *C)
|
||||
/************************ paint operator ************************/
|
||||
typedef enum eTexPaintMode {
|
||||
PAINT_MODE_2D,
|
||||
PAINT_MODE_3D_PROJECT
|
||||
PAINT_MODE_3D_PROJECT,
|
||||
} eTexPaintMode;
|
||||
|
||||
typedef struct PaintOperation {
|
||||
|
@@ -297,21 +297,21 @@ void flip_qt_qt(float out[3], const float in[3], const char symm);
|
||||
typedef enum BrushStrokeMode {
|
||||
BRUSH_STROKE_NORMAL,
|
||||
BRUSH_STROKE_INVERT,
|
||||
BRUSH_STROKE_SMOOTH
|
||||
BRUSH_STROKE_SMOOTH,
|
||||
} BrushStrokeMode;
|
||||
|
||||
/* paint_hide.c */
|
||||
|
||||
typedef enum {
|
||||
PARTIALVIS_HIDE,
|
||||
PARTIALVIS_SHOW
|
||||
PARTIALVIS_SHOW,
|
||||
} PartialVisAction;
|
||||
|
||||
typedef enum {
|
||||
PARTIALVIS_INSIDE,
|
||||
PARTIALVIS_OUTSIDE,
|
||||
PARTIALVIS_ALL,
|
||||
PARTIALVIS_MASKED
|
||||
PARTIALVIS_MASKED,
|
||||
} PartialVisArea;
|
||||
|
||||
void PAINT_OT_hide_show(struct wmOperatorType *ot);
|
||||
@@ -321,7 +321,7 @@ void PAINT_OT_hide_show(struct wmOperatorType *ot);
|
||||
typedef enum {
|
||||
PAINT_MASK_FLOOD_VALUE,
|
||||
PAINT_MASK_FLOOD_VALUE_INVERSE,
|
||||
PAINT_MASK_INVERT
|
||||
PAINT_MASK_INVERT,
|
||||
} PaintMaskFloodMode;
|
||||
|
||||
void PAINT_OT_mask_flood_fill(struct wmOperatorType *ot);
|
||||
|
@@ -550,7 +550,7 @@ static void BRUSH_OT_uv_sculpt_tool_set(wmOperatorType *ot)
|
||||
typedef enum {
|
||||
STENCIL_TRANSLATE,
|
||||
STENCIL_SCALE,
|
||||
STENCIL_ROTATE
|
||||
STENCIL_ROTATE,
|
||||
} StencilControlMode;
|
||||
|
||||
typedef enum {
|
||||
|
@@ -1094,7 +1094,7 @@ typedef struct tNearestVertInfo {
|
||||
typedef enum eGraphVertIndex {
|
||||
NEAREST_HANDLE_LEFT = -1,
|
||||
NEAREST_HANDLE_KEY,
|
||||
NEAREST_HANDLE_RIGHT
|
||||
NEAREST_HANDLE_RIGHT,
|
||||
} eGraphVertIndex;
|
||||
|
||||
/* Tolerance for absolute radius (in pixels) of the vert from the cursor to use */
|
||||
|
@@ -527,7 +527,7 @@ static int node_group_separate_selected(
|
||||
|
||||
typedef enum eNodeGroupSeparateType {
|
||||
NODE_GS_COPY,
|
||||
NODE_GS_MOVE
|
||||
NODE_GS_MOVE,
|
||||
} eNodeGroupSeparateType;
|
||||
|
||||
/* Operator Property */
|
||||
|
@@ -651,13 +651,13 @@ typedef enum eOutliner_PropDataOps {
|
||||
typedef enum eOutliner_PropConstraintOps {
|
||||
OL_CONSTRAINTOP_ENABLE = 1,
|
||||
OL_CONSTRAINTOP_DISABLE,
|
||||
OL_CONSTRAINTOP_DELETE
|
||||
OL_CONSTRAINTOP_DELETE,
|
||||
} eOutliner_PropConstraintOps;
|
||||
|
||||
typedef enum eOutliner_PropModifierOps {
|
||||
OL_MODIFIER_OP_TOGVIS = 1,
|
||||
OL_MODIFIER_OP_TOGREN,
|
||||
OL_MODIFIER_OP_DELETE
|
||||
OL_MODIFIER_OP_DELETE,
|
||||
} eOutliner_PropModifierOps;
|
||||
|
||||
static void pchan_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *UNUSED(arg))
|
||||
@@ -1188,7 +1188,7 @@ typedef enum eOutlinerIdOpTypes {
|
||||
OUTLINER_IDOP_FAKE_CLEAR,
|
||||
OUTLINER_IDOP_RENAME,
|
||||
|
||||
OUTLINER_IDOP_SELECT_LINKED
|
||||
OUTLINER_IDOP_SELECT_LINKED,
|
||||
} eOutlinerIdOpTypes;
|
||||
|
||||
// TODO: implement support for changing the ID-block used
|
||||
|
@@ -209,6 +209,7 @@ static void select_neighbor_from_last(Scene *scene, int lr)
|
||||
}
|
||||
}
|
||||
if (changed) {
|
||||
/* pass */
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@@ -1667,7 +1667,7 @@ typedef enum {
|
||||
UP,
|
||||
DOWN,
|
||||
LEFT,
|
||||
RIGHT
|
||||
RIGHT,
|
||||
} ArrowDirection;
|
||||
|
||||
#define POS_INDEX 0
|
||||
|
@@ -85,15 +85,15 @@ PyTypeObject MediumType_Type = {
|
||||
|
||||
PyLongObject _BPy_MediumType_DRY_MEDIUM = {
|
||||
PyVarObject_HEAD_INIT(&MediumType_Type, 1)
|
||||
{ Stroke::DRY_MEDIUM }
|
||||
{ Stroke::DRY_MEDIUM },
|
||||
};
|
||||
PyLongObject _BPy_MediumType_HUMID_MEDIUM = {
|
||||
PyVarObject_HEAD_INIT(&MediumType_Type, 1)
|
||||
{ Stroke::HUMID_MEDIUM }
|
||||
{ Stroke::HUMID_MEDIUM },
|
||||
};
|
||||
PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = {
|
||||
PyVarObject_HEAD_INIT(&MediumType_Type, 1)
|
||||
{ Stroke::OPAQUE_MEDIUM }
|
||||
{ Stroke::OPAQUE_MEDIUM },
|
||||
};
|
||||
|
||||
//-------------------MODULE INITIALIZATION--------------------------------
|
||||
|
@@ -50,7 +50,7 @@ typedef enum {
|
||||
MIN, /*!< The value computed for the 1D element is the minimum of the values obtained for the 0D elements.*/
|
||||
MAX, /*!< The value computed for the 1D element is the maximum of the values obtained for the 0D elements.*/
|
||||
FIRST, /*!< The value computed for the 1D element is the first of the values obtained for the 0D elements.*/
|
||||
LAST /*!< The value computed for the 1D element is the last of the values obtained for the 0D elements.*/
|
||||
LAST, /*!< The value computed for the 1D element is the last of the values obtained for the 0D elements.*/
|
||||
} IntegrationType;
|
||||
|
||||
/*! Returns a single value from a set of values evaluated at each 0D element of this 1D element.
|
||||
|
@@ -36,7 +36,7 @@ typedef enum {
|
||||
GPU_BATCH_READY_TO_FORMAT,
|
||||
GPU_BATCH_READY_TO_BUILD,
|
||||
GPU_BATCH_BUILDING,
|
||||
GPU_BATCH_READY_TO_DRAW
|
||||
GPU_BATCH_READY_TO_DRAW,
|
||||
} GPUBatchPhase;
|
||||
|
||||
#define GPU_BATCH_VBO_MAX_LEN 4
|
||||
|
@@ -35,7 +35,7 @@
|
||||
typedef enum {
|
||||
GPU_INDEX_U8, /* GL has this, Vulkan does not */
|
||||
GPU_INDEX_U16,
|
||||
GPU_INDEX_U32
|
||||
GPU_INDEX_U32,
|
||||
} GPUIndexBufType;
|
||||
|
||||
typedef struct GPUIndexBuf {
|
||||
|
@@ -41,7 +41,7 @@ typedef enum {
|
||||
GPU_PRIM_TRIS_ADJ,
|
||||
GPU_PRIM_LINE_STRIP_ADJ,
|
||||
|
||||
GPU_PRIM_NONE
|
||||
GPU_PRIM_NONE,
|
||||
} GPUPrimType;
|
||||
|
||||
/* what types of primitives does each shader expect? */
|
||||
|
@@ -33,7 +33,7 @@ typedef enum eGPUBlendFunction {
|
||||
/* These map directly to the GL_ filter functions, to minimize API add as needed*/
|
||||
typedef enum eGPUFilterFunction {
|
||||
GPU_NEAREST,
|
||||
GPU_LINEAR
|
||||
GPU_LINEAR,
|
||||
} eGPUFilterFunction;
|
||||
|
||||
void GPU_blend(bool enable);
|
||||
|
@@ -43,7 +43,7 @@ typedef enum {
|
||||
/* can be extended to support more types */
|
||||
GPU_USAGE_STREAM,
|
||||
GPU_USAGE_STATIC, /* do not keep data in memory */
|
||||
GPU_USAGE_DYNAMIC
|
||||
GPU_USAGE_DYNAMIC,
|
||||
} GPUUsageType;
|
||||
|
||||
typedef struct GPUVertBuf {
|
||||
|
@@ -43,14 +43,14 @@ typedef enum {
|
||||
|
||||
GPU_COMP_F32,
|
||||
|
||||
GPU_COMP_I10
|
||||
GPU_COMP_I10,
|
||||
} GPUVertCompType;
|
||||
|
||||
typedef enum {
|
||||
GPU_FETCH_FLOAT,
|
||||
GPU_FETCH_INT,
|
||||
GPU_FETCH_INT_TO_FLOAT_UNIT, /* 127 (ubyte) -> 0.5 (and so on for other int types) */
|
||||
GPU_FETCH_INT_TO_FLOAT /* 127 (any int type) -> 127.0 */
|
||||
GPU_FETCH_INT_TO_FLOAT, /* 127 (any int type) -> 127.0 */
|
||||
} GPUVertFetchMode;
|
||||
|
||||
typedef struct GPUVertAttr {
|
||||
|
@@ -133,7 +133,7 @@ static GPUPass *gpu_pass_cache_resolve_collision(
|
||||
typedef enum {
|
||||
FUNCTION_QUAL_IN,
|
||||
FUNCTION_QUAL_OUT,
|
||||
FUNCTION_QUAL_INOUT
|
||||
FUNCTION_QUAL_INOUT,
|
||||
} GPUFunctionQual;
|
||||
|
||||
typedef struct GPUFunction {
|
||||
|
@@ -51,7 +51,7 @@ typedef enum {
|
||||
* We support 5 outputs for now (usually we wouldn't need more to preserve fill rate). */
|
||||
/* Keep in mind that GL max is GL_MAX_DRAW_BUFFERS and is at least 8, corresponding to
|
||||
* the maximum number of COLOR attachments specified by glDrawBuffers. */
|
||||
GPU_FB_MAX_ATTACHEMENT
|
||||
GPU_FB_MAX_ATTACHEMENT,
|
||||
} GPUAttachmentType;
|
||||
|
||||
#define GPU_FB_MAX_COLOR_ATTACHMENT (GPU_FB_MAX_ATTACHEMENT - GPU_FB_COLOR_ATTACHMENT0)
|
||||
|
@@ -40,7 +40,7 @@ struct ImBuf;
|
||||
typedef enum ThumbSize {
|
||||
THB_NORMAL,
|
||||
THB_LARGE,
|
||||
THB_FAIL
|
||||
THB_FAIL,
|
||||
} ThumbSize;
|
||||
|
||||
typedef enum ThumbSource {
|
||||
|
@@ -141,7 +141,7 @@ typedef enum {
|
||||
UNSAFE_ALLOW_PLUS = 0x2, /* Allows '+' */
|
||||
UNSAFE_PATH = 0x8, /* Allows '/', '&', '=', ':', '@', '+', '$' and ',' */
|
||||
UNSAFE_HOST = 0x10, /* Allows '/' and ':' and '@' */
|
||||
UNSAFE_SLASHES = 0x20 /* Allows all characters except for '/' and '%' */
|
||||
UNSAFE_SLASHES = 0x20, /* Allows all characters except for '/' and '%' */
|
||||
} UnsafeCharacterSet;
|
||||
|
||||
static const unsigned char acceptable[96] = {
|
||||
|
@@ -90,7 +90,7 @@ typedef enum eFModifier_Types {
|
||||
FMODIFIER_TYPE_STEPPED = 9,
|
||||
|
||||
/* NOTE: all new modifiers must be added above this line */
|
||||
FMODIFIER_NUM_TYPES
|
||||
FMODIFIER_NUM_TYPES,
|
||||
} eFModifier_Types;
|
||||
|
||||
/** F-Curve Modifier Settings. */
|
||||
@@ -227,7 +227,7 @@ typedef enum eFMod_Cycling_Modes {
|
||||
/** repeat keyframe range, but with offset based on gradient between values */
|
||||
FCM_EXTRAPOLATE_CYCLIC_OFFSET,
|
||||
/** alternate between forward and reverse playback of keyframe range */
|
||||
FCM_EXTRAPOLATE_MIRROR
|
||||
FCM_EXTRAPOLATE_MIRROR,
|
||||
} eFMod_Cycling_Modes;
|
||||
|
||||
|
||||
@@ -278,7 +278,7 @@ typedef enum eFMod_Noise_Modifications {
|
||||
/** Subtract noise from the curve. */
|
||||
FCM_NOISE_MODIF_SUBTRACT,
|
||||
/** Multiply the curve by noise. */
|
||||
FCM_NOISE_MODIF_MULTIPLY
|
||||
FCM_NOISE_MODIF_MULTIPLY,
|
||||
} eFMod_Noise_Modifications;
|
||||
|
||||
|
||||
@@ -366,7 +366,7 @@ typedef enum eDriverTarget_TransformChannels {
|
||||
DTAR_TRANSCHAN_SCALEY,
|
||||
DTAR_TRANSCHAN_SCALEZ,
|
||||
|
||||
MAX_DTAR_TRANSCHAN_TYPES
|
||||
MAX_DTAR_TRANSCHAN_TYPES,
|
||||
} eDriverTarget_TransformChannels;
|
||||
|
||||
/* --- */
|
||||
@@ -422,7 +422,7 @@ typedef enum eDriverVar_Types {
|
||||
* \note This must always be th last item in this list,
|
||||
* so add new types above this line.
|
||||
*/
|
||||
MAX_DVAR_TYPES
|
||||
MAX_DVAR_TYPES,
|
||||
} eDriverVar_Types;
|
||||
|
||||
/* Driver Variable Flags */
|
||||
@@ -513,7 +513,7 @@ typedef enum eDriver_Types {
|
||||
/** smallest value. */
|
||||
DRIVER_TYPE_MIN,
|
||||
/** largest value. */
|
||||
DRIVER_TYPE_MAX
|
||||
DRIVER_TYPE_MAX,
|
||||
} eDriver_Types;
|
||||
|
||||
/** Driver flags. */
|
||||
@@ -636,7 +636,7 @@ typedef enum eFCurve_Extend {
|
||||
/** just extend min/max keyframe value */
|
||||
FCURVE_EXTRAPOLATE_CONSTANT = 0,
|
||||
/** just extend gradient of segment between first segment keyframes */
|
||||
FCURVE_EXTRAPOLATE_LINEAR
|
||||
FCURVE_EXTRAPOLATE_LINEAR,
|
||||
} eFCurve_Extend;
|
||||
|
||||
/* curve coloring modes */
|
||||
@@ -800,7 +800,7 @@ typedef enum eNlaStrip_Type {
|
||||
NLASTRIP_TYPE_META,
|
||||
|
||||
/* 'emit sound' - a strip which is used for timing when speaker emits sounds */
|
||||
NLASTRIP_TYPE_SOUND
|
||||
NLASTRIP_TYPE_SOUND,
|
||||
} eNlaStrip_Type;
|
||||
|
||||
/* NLA Tracks ------------------------------------- */
|
||||
@@ -904,7 +904,7 @@ typedef enum eKSP_Grouping {
|
||||
KSP_GROUP_KSNAME,
|
||||
/** Path should be grouped using name of inner-most context item from templates
|
||||
* - this is most useful for relative KeyingSets only. */
|
||||
KSP_GROUP_TEMPLATE_ITEM
|
||||
KSP_GROUP_TEMPLATE_ITEM,
|
||||
} eKSP_Grouping;
|
||||
|
||||
/* ---------------- */
|
||||
|
@@ -54,7 +54,7 @@ typedef enum eBoidRuleType {
|
||||
/** move next to a deflector object's in direction of it's tangent */
|
||||
eBoidRuleType_FollowWall = 12,
|
||||
#endif
|
||||
NUM_BOID_RULE_TYPES
|
||||
NUM_BOID_RULE_TYPES,
|
||||
} eBoidRuleType;
|
||||
|
||||
/* boidrule->flag */
|
||||
@@ -108,7 +108,7 @@ typedef enum eBoidMode {
|
||||
eBoidMode_Climbing = 2,
|
||||
eBoidMode_Falling = 3,
|
||||
eBoidMode_Liftoff = 4,
|
||||
NUM_BOID_MODES
|
||||
NUM_BOID_MODES,
|
||||
} eBoidMode;
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ typedef enum eBoidRulesetType {
|
||||
eBoidRulesetType_Fuzzy = 0,
|
||||
eBoidRulesetType_Random = 1,
|
||||
eBoidRulesetType_Average = 2,
|
||||
NUM_BOID_RULESET_TYPES
|
||||
NUM_BOID_RULESET_TYPES,
|
||||
} eBoidRulesetType;
|
||||
#define BOIDSTATE_CURRENT 1
|
||||
typedef struct BoidState {
|
||||
|
@@ -353,12 +353,12 @@ typedef struct PaintCurve {
|
||||
typedef enum eBrushGradientSourceStroke {
|
||||
BRUSH_GRADIENT_PRESSURE = 0, /* gradient from pressure */
|
||||
BRUSH_GRADIENT_SPACING_REPEAT = 1, /* gradient from spacing */
|
||||
BRUSH_GRADIENT_SPACING_CLAMP = 2 /* gradient from spacing */
|
||||
BRUSH_GRADIENT_SPACING_CLAMP = 2, /* gradient from spacing */
|
||||
} eBrushGradientSourceStroke;
|
||||
|
||||
typedef enum eBrushGradientSourceFill {
|
||||
BRUSH_GRADIENT_LINEAR = 0, /* gradient from pressure */
|
||||
BRUSH_GRADIENT_RADIAL = 1 /* gradient from spacing */
|
||||
BRUSH_GRADIENT_RADIAL = 1, /* gradient from spacing */
|
||||
} eBrushGradientSourceFill;
|
||||
|
||||
/* Brush.flag */
|
||||
@@ -531,7 +531,7 @@ typedef enum {
|
||||
/* blur kernel types, Brush.blur_mode */
|
||||
typedef enum eBlurKernelType {
|
||||
KERNEL_GAUSSIAN,
|
||||
KERNEL_BOX
|
||||
KERNEL_BOX,
|
||||
} eBlurKernelType;
|
||||
|
||||
/* Brush.falloff_shape */
|
||||
|
@@ -662,7 +662,7 @@ typedef enum eBConstraint_Types {
|
||||
CONSTRAINT_TYPE_ARMATURE = 30,
|
||||
|
||||
/* NOTE: no constraints are allowed to be added after this */
|
||||
NUM_CONSTRAINT_TYPES
|
||||
NUM_CONSTRAINT_TYPES,
|
||||
} eBConstraint_Types;
|
||||
|
||||
/* bConstraint->flag */
|
||||
@@ -704,7 +704,7 @@ typedef enum eBConstraint_SpaceTypes {
|
||||
/** For posechannels - local with parent. */
|
||||
CONSTRAINT_SPACE_PARLOCAL = 3,
|
||||
/** For files from between 2.43-2.46 (should have been parlocal). */
|
||||
CONSTRAINT_SPACE_INVALID = 4 /* do not exchange for anything! */
|
||||
CONSTRAINT_SPACE_INVALID = 4, /* do not exchange for anything! */
|
||||
} eBConstraint_SpaceTypes;
|
||||
|
||||
/* bConstraintChannel.flag */
|
||||
@@ -790,7 +790,7 @@ typedef enum eTrackToAxis_Modes {
|
||||
TRACK_Z = 2,
|
||||
TRACK_nX = 3,
|
||||
TRACK_nY = 4,
|
||||
TRACK_nZ = 5
|
||||
TRACK_nZ = 5,
|
||||
} eTrackToAxis_Modes;
|
||||
|
||||
/* Shrinkwrap flags */
|
||||
|
@@ -48,7 +48,7 @@ typedef enum GpencilModifierType {
|
||||
eGpencilModifierType_Mirror = 14,
|
||||
eGpencilModifierType_Armature = 15,
|
||||
eGpencilModifierType_Time = 16,
|
||||
NUM_GREASEPENCIL_MODIFIER_TYPES
|
||||
NUM_GREASEPENCIL_MODIFIER_TYPES,
|
||||
} GpencilModifierType;
|
||||
|
||||
typedef enum GpencilModifierMode {
|
||||
|
@@ -241,7 +241,7 @@ typedef enum eGPDstroke_Caps {
|
||||
GP_STROKE_CAP_ROUND = 0,
|
||||
GP_STROKE_CAP_FLAT = 1,
|
||||
|
||||
GP_STROKE_CAP_MAX
|
||||
GP_STROKE_CAP_MAX,
|
||||
} GPDstroke_Caps;
|
||||
|
||||
/* ***************************************** */
|
||||
@@ -626,7 +626,7 @@ typedef enum eGP_DepthOrdering {
|
||||
/* draw modes (Use 2D or 3D position) */
|
||||
typedef enum eGP_DrawMode {
|
||||
GP_DRAWMODE_2D = 0,
|
||||
GP_DRAWMODE_3D = 1
|
||||
GP_DRAWMODE_3D = 1,
|
||||
} eGP_DrawMode;
|
||||
|
||||
/* ***************************************** */
|
||||
|
@@ -88,7 +88,7 @@ typedef enum ModifierType {
|
||||
eModifierType_MeshSequenceCache = 52,
|
||||
eModifierType_SurfaceDeform = 53,
|
||||
eModifierType_WeightedNormal = 54,
|
||||
NUM_MODIFIER_TYPES
|
||||
NUM_MODIFIER_TYPES,
|
||||
} ModifierType;
|
||||
|
||||
typedef enum ModifierMode {
|
||||
@@ -99,7 +99,7 @@ typedef enum ModifierMode {
|
||||
eModifierMode_Expanded = (1 << 4),
|
||||
eModifierMode_Virtual = (1 << 5),
|
||||
eModifierMode_ApplyOnSpline = (1 << 6),
|
||||
eModifierMode_DisableTemporary = (1u << 31)
|
||||
eModifierMode_DisableTemporary = (1u << 31),
|
||||
} ModifierMode;
|
||||
|
||||
typedef struct ModifierData {
|
||||
|
@@ -62,7 +62,7 @@ typedef enum ePFieldType {
|
||||
/** Force based on smoke simulation air flow. */
|
||||
PFIELD_SMOKEFLOW = 13,
|
||||
|
||||
NUM_PFIELD_TYPES
|
||||
NUM_PFIELD_TYPES,
|
||||
} ePFieldType;
|
||||
|
||||
typedef struct PartDeflect {
|
||||
|
@@ -172,7 +172,7 @@ typedef enum eRigidBodyOb_Type {
|
||||
/* active geometry participant in simulation. is directly controlled by sim */
|
||||
RBO_TYPE_ACTIVE = 0,
|
||||
/* passive geometry participant in simulation. is directly controlled by animsys */
|
||||
RBO_TYPE_PASSIVE
|
||||
RBO_TYPE_PASSIVE,
|
||||
} eRigidBodyOb_Type;
|
||||
|
||||
/* Flags for RigidBodyOb */
|
||||
@@ -223,7 +223,7 @@ typedef enum eRigidBody_MeshSource {
|
||||
/* only deformations */
|
||||
RBO_MESH_DEFORM,
|
||||
/* final derived mesh */
|
||||
RBO_MESH_FINAL
|
||||
RBO_MESH_FINAL,
|
||||
} eRigidBody_MeshSource;
|
||||
|
||||
/* ******************************** */
|
||||
|
@@ -1053,7 +1053,7 @@ typedef enum eGP_Lockaxis_Types {
|
||||
GP_LOCKAXIS_X = 1,
|
||||
GP_LOCKAXIS_Y = 2,
|
||||
GP_LOCKAXIS_Z = 3,
|
||||
GP_LOCKAXIS_CURSOR = 4
|
||||
GP_LOCKAXIS_CURSOR = 4,
|
||||
} eGP_Lockaxis_Types;
|
||||
|
||||
/* Settings for a GPencil Stroke Sculpting Brush */
|
||||
@@ -2331,14 +2331,14 @@ typedef enum eGPencil_GuideTypes {
|
||||
GP_GUIDE_CIRCULAR = 0,
|
||||
GP_GUIDE_RADIAL,
|
||||
GP_GUIDE_PARALLEL,
|
||||
GP_GUIDE_GRID
|
||||
GP_GUIDE_GRID,
|
||||
} eGPencil_GuideTypes;
|
||||
|
||||
/* ToolSettings.gpencil_guide_references */
|
||||
typedef enum eGPencil_Guide_Reference {
|
||||
GP_GUIDE_REF_CURSOR = 0,
|
||||
GP_GUIDE_REF_CUSTOM,
|
||||
GP_GUIDE_REF_OBJECT
|
||||
GP_GUIDE_REF_OBJECT,
|
||||
} eGPencil_Guide_Reference;
|
||||
|
||||
/* ToolSettings.particle flag */
|
||||
|
@@ -42,7 +42,7 @@ typedef enum ShaderFxType {
|
||||
eShaderFxType_Colorize = 8,
|
||||
eShaderFxType_Shadow = 9,
|
||||
eShaderFxType_Glow = 10,
|
||||
NUM_SHADER_FX_TYPES
|
||||
NUM_SHADER_FX_TYPES,
|
||||
} ShaderFxType;
|
||||
|
||||
typedef enum ShaderFxMode {
|
||||
|
@@ -198,7 +198,7 @@ typedef enum eSpaceButtons_Context {
|
||||
BCONTEXT_OUTPUT = 16,
|
||||
|
||||
/* always as last... */
|
||||
BCONTEXT_TOT
|
||||
BCONTEXT_TOT,
|
||||
} eSpaceButtons_Context;
|
||||
|
||||
/* SpaceProperties.flag */
|
||||
|
@@ -341,7 +341,7 @@ typedef enum RawPropertyType {
|
||||
PROP_RAW_CHAR,
|
||||
PROP_RAW_BOOLEAN,
|
||||
PROP_RAW_DOUBLE,
|
||||
PROP_RAW_FLOAT
|
||||
PROP_RAW_FLOAT,
|
||||
} RawPropertyType;
|
||||
|
||||
typedef struct RawArray {
|
||||
|
@@ -30,7 +30,7 @@ static bNodeSocketTemplate inputs[] = {
|
||||
{ SOCK_VECTOR, 1, N_("Upper Right"), 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
|
||||
{ SOCK_VECTOR, 1, N_("Lower Left"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
|
||||
{ SOCK_VECTOR, 1, N_("Lower Right"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
|
@@ -197,7 +197,7 @@ static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_RGBA, 0, N_("Image")},
|
||||
{ SOCK_FLOAT, 0, N_("Matte")},
|
||||
{ SOCK_RGBA, 0, N_("Pick")},
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
void ntreeCompositCryptomatteSyncFromAdd(bNodeTree *UNUSED(ntree), bNode *node)
|
||||
|
@@ -32,7 +32,7 @@ static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_FLOAT, 0, "Size" },
|
||||
{ SOCK_VECTOR, 0, "Velocity" },
|
||||
{ SOCK_VECTOR, 0, "Angular Velocity" },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
static void node_shader_exec_particle_info(void *UNUSED(data), int UNUSED(thread), bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), bNodeStack **UNUSED(in), bNodeStack **UNUSED(out))
|
||||
{
|
||||
|
@@ -28,11 +28,11 @@
|
||||
static bNodeSocketTemplate inputs[] = {
|
||||
{ SOCK_RGBA, 1, N_("Texture"), 0.0f, 0.0f, 0.0f, 1.0f },
|
||||
{ SOCK_VECTOR, 1, N_("Coordinates"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_RGBA, 0, N_("Texture") },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static void colorfn(float *out, TexParams *p, bNode *UNUSED(node), bNodeStack **in, short thread)
|
||||
|
@@ -35,7 +35,7 @@ static bNodeSocketTemplate inputs[] = {
|
||||
{ SOCK_FLOAT, 1, N_("Bias"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
|
||||
{ SOCK_FLOAT, 1, N_("Brick Width"), 0.5f, 0.0f, 0.0f, 0.0f, 0.001f, 99.0f, PROP_UNSIGNED },
|
||||
{ SOCK_FLOAT, 1, N_("Row Height"), 0.25f, 0.0f, 0.0f, 0.0f, 0.001f, 99.0f, PROP_UNSIGNED },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_RGBA, 0, N_("Color")},
|
||||
|
@@ -30,11 +30,11 @@ static bNodeSocketTemplate inputs[] = {
|
||||
{ SOCK_RGBA, 1, N_("Color1"), 1.0f, 0.0f, 0.0f, 1.0f },
|
||||
{ SOCK_RGBA, 1, N_("Color2"), 1.0f, 1.0f, 1.0f, 1.0f },
|
||||
{ SOCK_FLOAT, 1, N_("Size"), 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 100.0f, PROP_UNSIGNED },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_RGBA, 0, N_("Color") },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static void colorfn(float *out, TexParams *p, bNode *UNUSED(node), bNodeStack **in, short thread)
|
||||
|
@@ -30,11 +30,11 @@ static bNodeSocketTemplate inputs[] = {
|
||||
{ SOCK_FLOAT, 1, N_("Green"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_UNSIGNED },
|
||||
{ SOCK_FLOAT, 1, N_("Blue"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_UNSIGNED },
|
||||
{ SOCK_FLOAT, 1, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_UNSIGNED },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_RGBA, 0, N_("Color") },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static void colorfn(float *out, TexParams *p, bNode *UNUSED(node), bNodeStack **in, short thread)
|
||||
|
@@ -27,7 +27,7 @@
|
||||
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_VECTOR, 0, N_("Coordinates") },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static void vectorfn(float *out, TexParams *p, bNode *UNUSED(node), bNodeStack **UNUSED(in), short UNUSED(thread))
|
||||
|
@@ -28,14 +28,14 @@
|
||||
|
||||
static bNodeSocketTemplate inputs[] = {
|
||||
{ SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_FLOAT, 0, N_("Red") },
|
||||
{ SOCK_FLOAT, 0, N_("Green") },
|
||||
{ SOCK_FLOAT, 0, N_("Blue") },
|
||||
{ SOCK_FLOAT, 0, N_("Alpha") },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static void valuefn_r(float *out, TexParams *p, bNode *UNUSED(node), bNodeStack **in, short thread)
|
||||
|
@@ -30,12 +30,12 @@
|
||||
static bNodeSocketTemplate inputs[] = {
|
||||
{ SOCK_VECTOR, 1, N_("Coordinate 1"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
|
||||
{ SOCK_VECTOR, 1, N_("Coordinate 2"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_FLOAT, 0, N_("Value") },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static void valuefn(float *out, TexParams *p, bNode *UNUSED(node), bNodeStack **in, short thread)
|
||||
|
@@ -32,11 +32,11 @@ static bNodeSocketTemplate inputs[] = {
|
||||
{ SOCK_FLOAT, 1, N_("Value"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_NONE },
|
||||
{ SOCK_FLOAT, 1, N_("Factor"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE },
|
||||
{ SOCK_RGBA, 1, N_("Color"), 0.8f, 0.8f, 0.8f, 1.0f },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
static bNodeSocketTemplate outputs[] = {
|
||||
{ SOCK_RGBA, 0, N_("Color") },
|
||||
{ -1, 0, "" }
|
||||
{ -1, 0, "" },
|
||||
};
|
||||
|
||||
static void do_hue_sat_fac(bNode *UNUSED(node), float *out, float hue, float sat, float val, float *in, float fac)
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user