archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup: switch statements, include break statements within braces & indent.

Browse Source 
also indent case's within the switch (we already did both of these almost everywhere)
This commit is contained in:
Campbell Barton
2013-07-19 15:23:42 +00:00
parent fd1d4151f1
commit 397da50002
55 changed files with 774 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/action.c
View File

@@ -930,9 +930,8 @@ void calc_action_range(const bAction *act, float *start, float *end, short incl_
if (fmd->flag & FCM_LIMIT_XMAX) { if (fmd->flag & FCM_LIMIT_XMAX) {
max = max_ff(max, fmd->rect.xmax); max = max_ff(max, fmd->rect.xmax);
} }
break;
} }
break;
case FMODIFIER_TYPE_CYCLES: /* Cycles F-Modifier */ case FMODIFIER_TYPE_CYCLES: /* Cycles F-Modifier */
{ {
FMod_Cycles *fmd = (FMod_Cycles *)fcm->data; FMod_Cycles *fmd = (FMod_Cycles *)fcm->data;
@@ -941,9 +940,8 @@ void calc_action_range(const bAction *act, float *start, float *end, short incl_
min = MINAFRAMEF; min = MINAFRAMEF;
if (fmd->after_mode != FCM_EXTRAPOLATE_NONE) if (fmd->after_mode != FCM_EXTRAPOLATE_NONE)
max = MAXFRAMEF; max = MAXFRAMEF;
break;
} }
break;
/* TODO: function modifier may need some special limits */ /* TODO: function modifier may need some special limits */
default: /* all other standard modifiers are on the infinite range... */ default: /* all other standard modifiers are on the infinite range... */

4
source/blender/blenkernel/intern/armature.c
View File

@@ -2100,8 +2100,8 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
/* z-axis scale */ /* z-axis scale */
scale = len_v3(pchan->pose_mat[2]); scale = len_v3(pchan->pose_mat[2]);
mul_v3_fl(poseMat[2], scale); mul_v3_fl(poseMat[2], scale);
break;
} }
break;
case CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC: case CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC:
{ {
/* 'volume preservation' */ /* 'volume preservation' */
@@ -2123,8 +2123,8 @@ static void splineik_evaluate_bone(tSplineIK_Tree *tree, Scene *scene, Object *o
/* apply the scaling */ /* apply the scaling */
mul_v3_fl(poseMat[0], scale); mul_v3_fl(poseMat[0], scale);
mul_v3_fl(poseMat[2], scale); mul_v3_fl(poseMat[2], scale);
break;
} }
break;
} }
/* finally, multiply the x and z scaling by the radius of the curve too, /* finally, multiply the x and z scaling by the radius of the curve too,

2
source/blender/blenkernel/intern/colortools.c
View File

@@ -328,8 +328,8 @@ void curvemap_reset(CurveMap *cuma, const rctf *clipr, int preset, int slope)
cuma->curve[i].x = i / ((float)cuma->totpoint - 1); cuma->curve[i].x = i / ((float)cuma->totpoint - 1);
cuma->curve[i].y = 0.5; cuma->curve[i].y = 0.5;
} }
break;
} }
break;
case CURVE_PRESET_ROUND: case CURVE_PRESET_ROUND:
cuma->curve[0].x = 0; cuma->curve[0].x = 0;
cuma->curve[0].y = 1; cuma->curve[0].y = 1;

61
source/blender/blenkernel/intern/constraint.c
View File

@@ -132,8 +132,8 @@ bConstraintOb *BKE_constraints_make_evalob(Scene *scene, Object *ob, void *subda
unit_m4(cob->matrix); unit_m4(cob->matrix);
copy_m4_m4(cob->startmat, cob->matrix); copy_m4_m4(cob->startmat, cob->matrix);
break;
} }
break;
case CONSTRAINT_OBTYPE_BONE: case CONSTRAINT_OBTYPE_BONE:
{ {
/* only set if we have valid bone, otherwise default */ /* only set if we have valid bone, otherwise default */
@@ -158,9 +158,8 @@ bConstraintOb *BKE_constraints_make_evalob(Scene *scene, Object *ob, void *subda
unit_m4(cob->matrix); unit_m4(cob->matrix);
copy_m4_m4(cob->startmat, cob->matrix); copy_m4_m4(cob->startmat, cob->matrix);
break;
} }
break;
default: /* other types not yet handled */ default: /* other types not yet handled */
unit_m4(cob->matrix); unit_m4(cob->matrix);
unit_m4(cob->startmat); unit_m4(cob->startmat);
@@ -195,8 +194,8 @@ void BKE_constraints_clear_evalob(bConstraintOb *cob)
/* copy inverse of delta back to owner */ /* copy inverse of delta back to owner */
invert_m4_m4(cob->ob->constinv, delta); invert_m4_m4(cob->ob->constinv, delta);
} }
break;
} }
break;
case CONSTRAINT_OBTYPE_BONE: case CONSTRAINT_OBTYPE_BONE:
{ {
/* cob->ob or cob->pchan might not exist */ /* cob->ob or cob->pchan might not exist */
@@ -207,8 +206,8 @@ void BKE_constraints_clear_evalob(bConstraintOb *cob)
/* copy inverse of delta back to owner */ /* copy inverse of delta back to owner */
invert_m4_m4(cob->pchan->constinv, delta); invert_m4_m4(cob->pchan->constinv, delta);
} }
break;
} }
break;
} }
/* free tempolary struct */ /* free tempolary struct */
@@ -246,8 +245,8 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[
/* call self with slightly different values */ /* call self with slightly different values */
BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to); BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
} }
break;
} }
break;
case CONSTRAINT_SPACE_POSE: /* ---------- FROM POSESPACE ---------- */ case CONSTRAINT_SPACE_POSE: /* ---------- FROM POSESPACE ---------- */
{ {
/* pose to world */ /* pose to world */
@@ -267,8 +266,8 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[
mul_m4_m4m4(mat, imat, mat); mul_m4_m4m4(mat, imat, mat);
} }
} }
break;
} }
break;
case CONSTRAINT_SPACE_LOCAL: /* ------------ FROM LOCALSPACE --------- */ case CONSTRAINT_SPACE_LOCAL: /* ------------ FROM LOCALSPACE --------- */
{ {
/* local to pose - do inverse procedure that was done for pose to local */ /* local to pose - do inverse procedure that was done for pose to local */
@@ -282,8 +281,8 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[
/* call self with slightly different values */ /* call self with slightly different values */
BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to); BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
} }
break;
} }
break;
case CONSTRAINT_SPACE_PARLOCAL: /* -------------- FROM LOCAL WITH PARENT ---------- */ case CONSTRAINT_SPACE_PARLOCAL: /* -------------- FROM LOCAL WITH PARENT ---------- */
{ {
/* local + parent to pose */ /* local + parent to pose */
@@ -297,8 +296,8 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[
/* call self with slightly different values */ /* call self with slightly different values */
BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to); BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
} }
break;
} }
break;
} }
} }
else { else {
@@ -2235,8 +2234,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the z axis gets mapped onto a third orthogonal vector */ /* the z axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[2], totmat[0], totmat[1]); cross_v3_v3v3(totmat[2], totmat[0], totmat[1]);
break;
} }
break;
case TRACK_Z: /* LOCK X TRACK Z */ case TRACK_Z: /* LOCK X TRACK Z */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2249,8 +2248,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the z axis gets mapped onto a third orthogonal vector */ /* the z axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[1], totmat[2], totmat[0]); cross_v3_v3v3(totmat[1], totmat[2], totmat[0]);
break;
} }
break;
case TRACK_nY: /* LOCK X TRACK -Y */ case TRACK_nY: /* LOCK X TRACK -Y */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2264,8 +2263,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the z axis gets mapped onto a third orthogonal vector */ /* the z axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[2], totmat[0], totmat[1]); cross_v3_v3v3(totmat[2], totmat[0], totmat[1]);
break;
} }
break;
case TRACK_nZ: /* LOCK X TRACK -Z */ case TRACK_nZ: /* LOCK X TRACK -Z */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2279,16 +2278,16 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the z axis gets mapped onto a third orthogonal vector */ /* the z axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[1], totmat[2], totmat[0]); cross_v3_v3v3(totmat[1], totmat[2], totmat[0]);
break;
} }
break;
default: default:
{ {
unit_m3(totmat); unit_m3(totmat);
break;
} }
break;
} }
break;
} }
break;
case LOCK_Y: /* LOCK Y */ case LOCK_Y: /* LOCK Y */
{ {
switch (data->trackflag) { switch (data->trackflag) {
@@ -2304,8 +2303,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the z axis gets mapped onto a third orthogonal vector */ /* the z axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[2], totmat[0], totmat[1]); cross_v3_v3v3(totmat[2], totmat[0], totmat[1]);
break;
} }
break;
case TRACK_Z: /* LOCK Y TRACK Z */ case TRACK_Z: /* LOCK Y TRACK Z */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2318,8 +2317,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the z axis gets mapped onto a third orthogonal vector */ /* the z axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[0], totmat[1], totmat[2]); cross_v3_v3v3(totmat[0], totmat[1], totmat[2]);
break;
} }
break;
case TRACK_nX: /* LOCK Y TRACK -X */ case TRACK_nX: /* LOCK Y TRACK -X */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2333,8 +2332,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the z axis gets mapped onto a third orthogonal vector */ /* the z axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[2], totmat[0], totmat[1]); cross_v3_v3v3(totmat[2], totmat[0], totmat[1]);
break;
} }
break;
case TRACK_nZ: /* LOCK Y TRACK -Z */ case TRACK_nZ: /* LOCK Y TRACK -Z */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2348,16 +2347,16 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the z axis gets mapped onto a third orthogonal vector */ /* the z axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[0], totmat[1], totmat[2]); cross_v3_v3v3(totmat[0], totmat[1], totmat[2]);
break;
} }
break;
default: default:
{ {
unit_m3(totmat); unit_m3(totmat);
break;
} }
break;
} }
break;
} }
break;
case LOCK_Z: /* LOCK Z */ case LOCK_Z: /* LOCK Z */
{ {
switch (data->trackflag) { switch (data->trackflag) {
@@ -2373,8 +2372,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the x axis gets mapped onto a third orthogonal vector */ /* the x axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[1], totmat[2], totmat[0]); cross_v3_v3v3(totmat[1], totmat[2], totmat[0]);
break;
} }
break;
case TRACK_Y: /* LOCK Z TRACK Y */ case TRACK_Y: /* LOCK Z TRACK Y */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2387,8 +2386,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the x axis gets mapped onto a third orthogonal vector */ /* the x axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[0], totmat[1], totmat[2]); cross_v3_v3v3(totmat[0], totmat[1], totmat[2]);
break;
} }
break;
case TRACK_nX: /* LOCK Z TRACK -X */ case TRACK_nX: /* LOCK Z TRACK -X */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2402,8 +2401,8 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the x axis gets mapped onto a third orthogonal vector */ /* the x axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[1], totmat[2], totmat[0]); cross_v3_v3v3(totmat[1], totmat[2], totmat[0]);
break;
} }
break;
case TRACK_nY: /* LOCK Z TRACK -Y */ case TRACK_nY: /* LOCK Z TRACK -Y */
{ {
/* Projection of Vector on the plane */ /* Projection of Vector on the plane */
@@ -2417,21 +2416,21 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* the x axis gets mapped onto a third orthogonal vector */ /* the x axis gets mapped onto a third orthogonal vector */
cross_v3_v3v3(totmat[0], totmat[1], totmat[2]); cross_v3_v3v3(totmat[0], totmat[1], totmat[2]);
break;
} }
break;
default: default:
{ {
unit_m3(totmat); unit_m3(totmat);
break;
} }
break;
} }
break;
} }
break;
default: default:
{ {
unit_m3(totmat); unit_m3(totmat);
break;
} }
break;
} }
/* Block to keep matrix heading */ /* Block to keep matrix heading */
copy_m3_m4(tmpmat, cob->matrix); copy_m3_m4(tmpmat, cob->matrix);
@@ -4414,8 +4413,8 @@ static bConstraint *add_new_constraint(Object *ob, bPoseChannel *pchan, const ch
con->ownspace = CONSTRAINT_SPACE_POSE; con->ownspace = CONSTRAINT_SPACE_POSE;
con->flag |= CONSTRAINT_SPACEONCE; con->flag |= CONSTRAINT_SPACEONCE;
} }
break;
} }
break;
} }
return con; return con;
@@ -4640,8 +4639,8 @@ void BKE_get_constraint_target_matrix(Scene *scene, bConstraint *con, int index,
unit_m4(cob->matrix); unit_m4(cob->matrix);
unit_m4(cob->startmat); unit_m4(cob->startmat);
} }
break;
} }
break;
case CONSTRAINT_OBTYPE_BONE: /* this may occur in some cases */ case CONSTRAINT_OBTYPE_BONE: /* this may occur in some cases */
{ {
cob->ob = NULL; /* this might not work at all :/ */ cob->ob = NULL; /* this might not work at all :/ */
@@ -4654,8 +4653,8 @@ void BKE_get_constraint_target_matrix(Scene *scene, bConstraint *con, int index,
unit_m4(cob->matrix); unit_m4(cob->matrix);
unit_m4(cob->startmat); unit_m4(cob->startmat);
} }
break;
} }
break;
} }
/* get targets - we only need the first one though (and there should only be one) */ /* get targets - we only need the first one though (and there should only be one) */

14
source/blender/blenkernel/intern/fcurve.c
View File

@@ -667,17 +667,16 @@ short fcurve_are_keyframes_usable(FCurve *fcu)
if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0) if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0)
return 0; return 0;
break;
} }
break;
case FMODIFIER_TYPE_FN_GENERATOR: case FMODIFIER_TYPE_FN_GENERATOR:
{ {
FMod_FunctionGenerator *data = (FMod_FunctionGenerator *)fcm->data; FMod_FunctionGenerator *data = (FMod_FunctionGenerator *)fcm->data;
if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0) if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0)
return 0; return 0;
break;
} }
break;
/* always harmful - cannot allow */ /* always harmful - cannot allow */
default: default:
return 0; return 0;
@@ -1703,9 +1702,8 @@ static float evaluate_driver(ChannelDriver *driver, const float evaltime)
else else
driver->curval = value; driver->curval = value;
} }
break;
} }
break;
case DRIVER_TYPE_MIN: /* smallest value */ case DRIVER_TYPE_MIN: /* smallest value */
case DRIVER_TYPE_MAX: /* largest value */ case DRIVER_TYPE_MAX: /* largest value */
{ {
@@ -1738,9 +1736,8 @@ static float evaluate_driver(ChannelDriver *driver, const float evaltime)
/* store value in driver */ /* store value in driver */
driver->curval = value; driver->curval = value;
break;
} }
break;
case DRIVER_TYPE_PYTHON: /* expression */ case DRIVER_TYPE_PYTHON: /* expression */
{ {
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
@@ -1759,9 +1756,8 @@ static float evaluate_driver(ChannelDriver *driver, const float evaltime)
#else /* WITH_PYTHON*/ #else /* WITH_PYTHON*/
(void)evaltime; (void)evaltime;
#endif /* WITH_PYTHON*/ #endif /* WITH_PYTHON*/
break;
} }
break;
default: default:
{ {
/* special 'hack' - just use stored value /* special 'hack' - just use stored value

12
source/blender/blenkernel/intern/fmodifier.c
View File

@@ -213,9 +213,8 @@ static void fcm_generator_evaluate(FCurve *UNUSED(fcu), FModifier *fcm, float *c
/* cleanup */ /* cleanup */
if (powers) if (powers)
MEM_freeN(powers); MEM_freeN(powers);
break;
} }
break;
case FCM_GENERATOR_POLYNOMIAL_FACTORISED: /* Factorized polynomial */ case FCM_GENERATOR_POLYNOMIAL_FACTORISED: /* Factorized polynomial */
{ {
float value = 1.0f, *cp = NULL; float value = 1.0f, *cp = NULL;
@@ -232,8 +231,8 @@ static void fcm_generator_evaluate(FCurve *UNUSED(fcu), FModifier *fcm, float *c
else else
*cvalue = value; *cvalue = value;
} }
break;
} }
break;
} }
} }
@@ -316,8 +315,8 @@ static void fcm_fn_generator_evaluate(FCurve *UNUSED(fcu), FModifier *fcm, float
} }
else else
fn = tan; fn = tan;
break;
} }
break;
case FCM_GENERATOR_FN_LN: /* natural log */ case FCM_GENERATOR_FN_LN: /* natural log */
{ {
/* check that value is greater than 1? */ /* check that value is greater than 1? */
@@ -328,8 +327,8 @@ static void fcm_fn_generator_evaluate(FCurve *UNUSED(fcu), FModifier *fcm, float
if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0) if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0)
*cvalue = 0.0f; /* no value possible here */ *cvalue = 0.0f; /* no value possible here */
} }
break;
} }
break;
case FCM_GENERATOR_FN_SQRT: /* square root */ case FCM_GENERATOR_FN_SQRT: /* square root */
{ {
/* no negative numbers */ /* no negative numbers */
@@ -340,9 +339,8 @@ static void fcm_fn_generator_evaluate(FCurve *UNUSED(fcu), FModifier *fcm, float
if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0) if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0)
*cvalue = 0.0f; /* no value possible here */ *cvalue = 0.0f; /* no value possible here */
} }
break;
} }
break;
default: default:
printf("Invalid Function-Generator for F-Modifier - %d\n", data->type); printf("Invalid Function-Generator for F-Modifier - %d\n", data->type);
} }

5
source/blender/blenkernel/intern/ipo.c
View File

@@ -1174,9 +1174,8 @@ static void icu_to_fcurves(ID *id, ListBase *groups, ListBase *list, IpoCurve *i
{ {
/* just copy, as the new defines match the old ones... */ /* just copy, as the new defines match the old ones... */
fcu->extend = icu->extrap; fcu->extend = icu->extrap;
break;
} }
break;
case IPO_CYCL: /* cyclic extrapolation */ case IPO_CYCL: /* cyclic extrapolation */
case IPO_CYCLX: /* cyclic extrapolation + offset */ case IPO_CYCLX: /* cyclic extrapolation + offset */
{ {
@@ -1191,8 +1190,8 @@ static void icu_to_fcurves(ID *id, ListBase *groups, ListBase *list, IpoCurve *i
data->before_mode = data->after_mode = FCM_EXTRAPOLATE_CYCLIC_OFFSET; data->before_mode = data->after_mode = FCM_EXTRAPOLATE_CYCLIC_OFFSET;
else else
data->before_mode = data->after_mode = FCM_EXTRAPOLATE_CYCLIC; data->before_mode = data->after_mode = FCM_EXTRAPOLATE_CYCLIC;
break;
} }
break;
} }
/* -------- */ /* -------- */

536
source/blender/blenkernel/intern/linestyle.c
View File

@@ -201,20 +201,20 @@ static LineStyleModifier *alloc_color_modifier(int type)
size_t size; size_t size;
switch (type) { switch (type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
size = sizeof(LineStyleColorModifier_AlongStroke); size = sizeof(LineStyleColorModifier_AlongStroke);
break; break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA: case LS_MODIFIER_DISTANCE_FROM_CAMERA:
size = sizeof(LineStyleColorModifier_DistanceFromCamera); size = sizeof(LineStyleColorModifier_DistanceFromCamera);
break; break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT: case LS_MODIFIER_DISTANCE_FROM_OBJECT:
size = sizeof(LineStyleColorModifier_DistanceFromObject); size = sizeof(LineStyleColorModifier_DistanceFromObject);
break; break;
case LS_MODIFIER_MATERIAL: case LS_MODIFIER_MATERIAL:
size = sizeof(LineStyleColorModifier_Material); size = sizeof(LineStyleColorModifier_Material);
break; break;
default: default:
return NULL; /* unknown modifier type */ return NULL; /* unknown modifier type */
} }
return new_modifier(type, size); return new_modifier(type, size);
@@ -228,26 +228,26 @@ LineStyleModifier *BKE_add_linestyle_color_modifier(FreestyleLineStyle *linestyl
m->blend = MA_RAMP_BLEND; m->blend = MA_RAMP_BLEND;
switch (type) { switch (type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
((LineStyleColorModifier_AlongStroke *)m)->color_ramp = add_colorband(1); ((LineStyleColorModifier_AlongStroke *)m)->color_ramp = add_colorband(1);
break; break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA: case LS_MODIFIER_DISTANCE_FROM_CAMERA:
((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp = add_colorband(1); ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp = add_colorband(1);
((LineStyleColorModifier_DistanceFromCamera *)m)->range_min = 0.0f; ((LineStyleColorModifier_DistanceFromCamera *)m)->range_min = 0.0f;
((LineStyleColorModifier_DistanceFromCamera *)m)->range_max = 10000.0f; ((LineStyleColorModifier_DistanceFromCamera *)m)->range_max = 10000.0f;
break; break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT: case LS_MODIFIER_DISTANCE_FROM_OBJECT:
((LineStyleColorModifier_DistanceFromObject *)m)->target = NULL; ((LineStyleColorModifier_DistanceFromObject *)m)->target = NULL;
((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp = add_colorband(1); ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp = add_colorband(1);
((LineStyleColorModifier_DistanceFromObject *)m)->range_min = 0.0f; ((LineStyleColorModifier_DistanceFromObject *)m)->range_min = 0.0f;
((LineStyleColorModifier_DistanceFromObject *)m)->range_max = 10000.0f; ((LineStyleColorModifier_DistanceFromObject *)m)->range_max = 10000.0f;
break; break;
case LS_MODIFIER_MATERIAL: case LS_MODIFIER_MATERIAL:
((LineStyleColorModifier_Material *)m)->color_ramp = add_colorband(1); ((LineStyleColorModifier_Material *)m)->color_ramp = add_colorband(1);
((LineStyleColorModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_DIFF; ((LineStyleColorModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_DIFF;
break; break;
default: default:
return NULL; /* unknown modifier type */ return NULL; /* unknown modifier type */
} }
add_to_modifier_list(&linestyle->color_modifiers, m); add_to_modifier_list(&linestyle->color_modifiers, m);
@@ -264,23 +264,23 @@ LineStyleModifier *BKE_copy_linestyle_color_modifier(FreestyleLineStyle *linesty
new_m->blend = m->blend; new_m->blend = m->blend;
switch (m->type) { switch (m->type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
{ {
LineStyleColorModifier_AlongStroke *p = (LineStyleColorModifier_AlongStroke *)m; LineStyleColorModifier_AlongStroke *p = (LineStyleColorModifier_AlongStroke *)m;
LineStyleColorModifier_AlongStroke *q = (LineStyleColorModifier_AlongStroke *)new_m; LineStyleColorModifier_AlongStroke *q = (LineStyleColorModifier_AlongStroke *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp); q->color_ramp = MEM_dupallocN(p->color_ramp);
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_CAMERA:
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
{ {
LineStyleColorModifier_DistanceFromCamera *p = (LineStyleColorModifier_DistanceFromCamera *)m; LineStyleColorModifier_DistanceFromCamera *p = (LineStyleColorModifier_DistanceFromCamera *)m;
LineStyleColorModifier_DistanceFromCamera *q = (LineStyleColorModifier_DistanceFromCamera *)new_m; LineStyleColorModifier_DistanceFromCamera *q = (LineStyleColorModifier_DistanceFromCamera *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp); q->color_ramp = MEM_dupallocN(p->color_ramp);
q->range_min = p->range_min; q->range_min = p->range_min;
q->range_max = p->range_max; q->range_max = p->range_max;
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_OBJECT:
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
{ {
LineStyleColorModifier_DistanceFromObject *p = (LineStyleColorModifier_DistanceFromObject *)m; LineStyleColorModifier_DistanceFromObject *p = (LineStyleColorModifier_DistanceFromObject *)m;
LineStyleColorModifier_DistanceFromObject *q = (LineStyleColorModifier_DistanceFromObject *)new_m; LineStyleColorModifier_DistanceFromObject *q = (LineStyleColorModifier_DistanceFromObject *)new_m;
@@ -290,19 +290,19 @@ LineStyleModifier *BKE_copy_linestyle_color_modifier(FreestyleLineStyle *linesty
q->color_ramp = MEM_dupallocN(p->color_ramp); q->color_ramp = MEM_dupallocN(p->color_ramp);
q->range_min = p->range_min; q->range_min = p->range_min;
q->range_max = p->range_max; q->range_max = p->range_max;
break;
} }
break; case LS_MODIFIER_MATERIAL:
case LS_MODIFIER_MATERIAL:
{ {
LineStyleColorModifier_Material *p = (LineStyleColorModifier_Material *)m; LineStyleColorModifier_Material *p = (LineStyleColorModifier_Material *)m;
LineStyleColorModifier_Material *q = (LineStyleColorModifier_Material *)new_m; LineStyleColorModifier_Material *q = (LineStyleColorModifier_Material *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp); q->color_ramp = MEM_dupallocN(p->color_ramp);
q->flags = p->flags; q->flags = p->flags;
q->mat_attr = p->mat_attr; q->mat_attr = p->mat_attr;
break;
} }
break; default:
default: return NULL; /* unknown modifier type */
return NULL; /* unknown modifier type */
} }
add_to_modifier_list(&linestyle->color_modifiers, new_m); add_to_modifier_list(&linestyle->color_modifiers, new_m);
@@ -312,18 +312,18 @@ LineStyleModifier *BKE_copy_linestyle_color_modifier(FreestyleLineStyle *linesty
void BKE_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) void BKE_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
{ {
switch (m->type) { switch (m->type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
MEM_freeN(((LineStyleColorModifier_AlongStroke *)m)->color_ramp); MEM_freeN(((LineStyleColorModifier_AlongStroke *)m)->color_ramp);
break; break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA: case LS_MODIFIER_DISTANCE_FROM_CAMERA:
MEM_freeN(((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp); MEM_freeN(((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp);
break; break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT: case LS_MODIFIER_DISTANCE_FROM_OBJECT:
MEM_freeN(((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp); MEM_freeN(((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp);
break; break;
case LS_MODIFIER_MATERIAL: case LS_MODIFIER_MATERIAL:
MEM_freeN(((LineStyleColorModifier_Material *)m)->color_ramp); MEM_freeN(((LineStyleColorModifier_Material *)m)->color_ramp);
break; break;
} }
BLI_freelinkN(&linestyle->color_modifiers, m); BLI_freelinkN(&linestyle->color_modifiers, m);
} }
@@ -333,20 +333,20 @@ static LineStyleModifier *alloc_alpha_modifier(int type)
size_t size; size_t size;
switch (type) { switch (type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
size = sizeof(LineStyleAlphaModifier_AlongStroke); size = sizeof(LineStyleAlphaModifier_AlongStroke);
break; break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA: case LS_MODIFIER_DISTANCE_FROM_CAMERA:
size = sizeof(LineStyleAlphaModifier_DistanceFromCamera); size = sizeof(LineStyleAlphaModifier_DistanceFromCamera);
break; break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT: case LS_MODIFIER_DISTANCE_FROM_OBJECT:
size = sizeof(LineStyleAlphaModifier_DistanceFromObject); size = sizeof(LineStyleAlphaModifier_DistanceFromObject);
break; break;
case LS_MODIFIER_MATERIAL: case LS_MODIFIER_MATERIAL:
size = sizeof(LineStyleAlphaModifier_Material); size = sizeof(LineStyleAlphaModifier_Material);
break; break;
default: default:
return NULL; /* unknown modifier type */ return NULL; /* unknown modifier type */
} }
return new_modifier(type, size); return new_modifier(type, size);
} }
@@ -359,38 +359,38 @@ LineStyleModifier *BKE_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyl
m->blend = LS_VALUE_BLEND; m->blend = LS_VALUE_BLEND;
switch (type) { switch (type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
{ {
LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m; LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m;
p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_CAMERA:
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
{ {
LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m; LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m;
p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
p->range_min = 0.0f; p->range_min = 0.0f;
p->range_max = 10000.0f; p->range_max = 10000.0f;
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_OBJECT:
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
{ {
LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m; LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m;
p->target = NULL; p->target = NULL;
p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
p->range_min = 0.0f; p->range_min = 0.0f;
p->range_max = 10000.0f; p->range_max = 10000.0f;
break;
} }
break; case LS_MODIFIER_MATERIAL:
case LS_MODIFIER_MATERIAL:
{ {
LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m; LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m;
p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
p->mat_attr = LS_MODIFIER_MATERIAL_DIFF; p->mat_attr = LS_MODIFIER_MATERIAL_DIFF;
break;
} }
break; default:
default: return NULL; /* unknown modifier type */
return NULL; /* unknown modifier type */
} }
add_to_modifier_list(&linestyle->alpha_modifiers, m); add_to_modifier_list(&linestyle->alpha_modifiers, m);
@@ -407,15 +407,15 @@ LineStyleModifier *BKE_copy_linestyle_alpha_modifier(FreestyleLineStyle *linesty
new_m->blend = m->blend; new_m->blend = m->blend;
switch (m->type) { switch (m->type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
{ {
LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m; LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m;
LineStyleAlphaModifier_AlongStroke *q = (LineStyleAlphaModifier_AlongStroke *)new_m; LineStyleAlphaModifier_AlongStroke *q = (LineStyleAlphaModifier_AlongStroke *)new_m;
q->curve = curvemapping_copy(p->curve); q->curve = curvemapping_copy(p->curve);
q->flags = p->flags; q->flags = p->flags;
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_CAMERA:
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
{ {
LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m; LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m;
LineStyleAlphaModifier_DistanceFromCamera *q = (LineStyleAlphaModifier_DistanceFromCamera *)new_m; LineStyleAlphaModifier_DistanceFromCamera *q = (LineStyleAlphaModifier_DistanceFromCamera *)new_m;
@@ -423,9 +423,9 @@ LineStyleModifier *BKE_copy_linestyle_alpha_modifier(FreestyleLineStyle *linesty
q->flags = p->flags; q->flags = p->flags;
q->range_min = p->range_min; q->range_min = p->range_min;
q->range_max = p->range_max; q->range_max = p->range_max;
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_OBJECT:
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
{ {
LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m; LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m;
LineStyleAlphaModifier_DistanceFromObject *q = (LineStyleAlphaModifier_DistanceFromObject *)new_m; LineStyleAlphaModifier_DistanceFromObject *q = (LineStyleAlphaModifier_DistanceFromObject *)new_m;
@@ -436,19 +436,19 @@ LineStyleModifier *BKE_copy_linestyle_alpha_modifier(FreestyleLineStyle *linesty
q->flags = p->flags; q->flags = p->flags;
q->range_min = p->range_min; q->range_min = p->range_min;
q->range_max = p->range_max; q->range_max = p->range_max;
break;
} }
break; case LS_MODIFIER_MATERIAL:
case LS_MODIFIER_MATERIAL:
{ {
LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m; LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m;
LineStyleAlphaModifier_Material *q = (LineStyleAlphaModifier_Material *)new_m; LineStyleAlphaModifier_Material *q = (LineStyleAlphaModifier_Material *)new_m;
q->curve = curvemapping_copy(p->curve); q->curve = curvemapping_copy(p->curve);
q->flags = p->flags; q->flags = p->flags;
q->mat_attr = p->mat_attr; q->mat_attr = p->mat_attr;
break;
} }
break; default:
default: return NULL; /* unknown modifier type */
return NULL; /* unknown modifier type */
} }
add_to_modifier_list(&linestyle->alpha_modifiers, new_m); add_to_modifier_list(&linestyle->alpha_modifiers, new_m);
@@ -458,18 +458,18 @@ LineStyleModifier *BKE_copy_linestyle_alpha_modifier(FreestyleLineStyle *linesty
void BKE_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) void BKE_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
{ {
switch (m->type) { switch (m->type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
curvemapping_free(((LineStyleAlphaModifier_AlongStroke *)m)->curve); curvemapping_free(((LineStyleAlphaModifier_AlongStroke *)m)->curve);
break; break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA: case LS_MODIFIER_DISTANCE_FROM_CAMERA:
curvemapping_free(((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve); curvemapping_free(((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
break; break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT: case LS_MODIFIER_DISTANCE_FROM_OBJECT:
curvemapping_free(((LineStyleAlphaModifier_DistanceFromObject *)m)->curve); curvemapping_free(((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
break; break;
case LS_MODIFIER_MATERIAL: case LS_MODIFIER_MATERIAL:
curvemapping_free(((LineStyleAlphaModifier_Material *)m)->curve); curvemapping_free(((LineStyleAlphaModifier_Material *)m)->curve);
break; break;
} }
BLI_freelinkN(&linestyle->alpha_modifiers, m); BLI_freelinkN(&linestyle->alpha_modifiers, m);
} }
@@ -479,23 +479,23 @@ static LineStyleModifier *alloc_thickness_modifier(int type)
size_t size; size_t size;
switch (type) { switch (type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
size = sizeof(LineStyleThicknessModifier_AlongStroke); size = sizeof(LineStyleThicknessModifier_AlongStroke);
break; break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA: case LS_MODIFIER_DISTANCE_FROM_CAMERA:
size = sizeof(LineStyleThicknessModifier_DistanceFromCamera); size = sizeof(LineStyleThicknessModifier_DistanceFromCamera);
break; break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT: case LS_MODIFIER_DISTANCE_FROM_OBJECT:
size = sizeof(LineStyleThicknessModifier_DistanceFromObject); size = sizeof(LineStyleThicknessModifier_DistanceFromObject);
break; break;
case LS_MODIFIER_MATERIAL: case LS_MODIFIER_MATERIAL:
size = sizeof(LineStyleThicknessModifier_Material); size = sizeof(LineStyleThicknessModifier_Material);
break; break;
case LS_MODIFIER_CALLIGRAPHY: case LS_MODIFIER_CALLIGRAPHY:
size = sizeof(LineStyleThicknessModifier_Calligraphy); size = sizeof(LineStyleThicknessModifier_Calligraphy);
break; break;
default: default:
return NULL; /* unknown modifier type */ return NULL; /* unknown modifier type */
} }
return new_modifier(type, size); return new_modifier(type, size);
@@ -509,15 +509,15 @@ LineStyleModifier *BKE_add_linestyle_thickness_modifier(FreestyleLineStyle *line
m->blend = LS_VALUE_BLEND; m->blend = LS_VALUE_BLEND;
switch (type) { switch (type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
{ {
LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m; LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m;
p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
p->value_min = 0.0f; p->value_min = 0.0f;
p->value_max = 1.0f; p->value_max = 1.0f;
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_CAMERA:
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
{ {
LineStyleThicknessModifier_DistanceFromCamera *p = (LineStyleThicknessModifier_DistanceFromCamera *)m; LineStyleThicknessModifier_DistanceFromCamera *p = (LineStyleThicknessModifier_DistanceFromCamera *)m;
p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
@@ -525,9 +525,9 @@ LineStyleModifier *BKE_add_linestyle_thickness_modifier(FreestyleLineStyle *line
p->range_max = 1000.0f; p->range_max = 1000.0f;
p->value_min = 0.0f; p->value_min = 0.0f;
p->value_max = 1.0f; p->value_max = 1.0f;
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_OBJECT:
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
{ {
LineStyleThicknessModifier_DistanceFromObject *p = (LineStyleThicknessModifier_DistanceFromObject *)m; LineStyleThicknessModifier_DistanceFromObject *p = (LineStyleThicknessModifier_DistanceFromObject *)m;
p->target = NULL; p->target = NULL;
@@ -536,27 +536,27 @@ LineStyleModifier *BKE_add_linestyle_thickness_modifier(FreestyleLineStyle *line
p->range_max = 1000.0f; p->range_max = 1000.0f;
p->value_min = 0.0f; p->value_min = 0.0f;
p->value_max = 1.0f; p->value_max = 1.0f;
break;
} }
break; case LS_MODIFIER_MATERIAL:
case LS_MODIFIER_MATERIAL:
{ {
LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m; LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m;
p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
p->mat_attr = LS_MODIFIER_MATERIAL_DIFF; p->mat_attr = LS_MODIFIER_MATERIAL_DIFF;
p->value_min = 0.0f; p->value_min = 0.0f;
p->value_max = 1.0f; p->value_max = 1.0f;
break;
} }
break; case LS_MODIFIER_CALLIGRAPHY:
case LS_MODIFIER_CALLIGRAPHY:
{ {
LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m; LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m;
p->min_thickness = 1.0f; p->min_thickness = 1.0f;
p->max_thickness = 10.0f; p->max_thickness = 10.0f;
p->orientation = DEG2RADF(60.0f); p->orientation = DEG2RADF(60.0f);
break;
} }
break; default:
default: return NULL; /* unknown modifier type */
return NULL; /* unknown modifier type */
} }
add_to_modifier_list(&linestyle->thickness_modifiers, m); add_to_modifier_list(&linestyle->thickness_modifiers, m);
@@ -575,7 +575,7 @@ LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin
new_m->blend = m->blend; new_m->blend = m->blend;
switch (m->type) { switch (m->type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
{ {
LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m; LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m;
LineStyleThicknessModifier_AlongStroke *q = (LineStyleThicknessModifier_AlongStroke *)new_m; LineStyleThicknessModifier_AlongStroke *q = (LineStyleThicknessModifier_AlongStroke *)new_m;
@@ -583,9 +583,9 @@ LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin
q->flags = p->flags; q->flags = p->flags;
q->value_min = p->value_min; q->value_min = p->value_min;
q->value_max = p->value_max; q->value_max = p->value_max;
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_CAMERA:
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
{ {
LineStyleThicknessModifier_DistanceFromCamera *p = (LineStyleThicknessModifier_DistanceFromCamera *)m; LineStyleThicknessModifier_DistanceFromCamera *p = (LineStyleThicknessModifier_DistanceFromCamera *)m;
LineStyleThicknessModifier_DistanceFromCamera *q = (LineStyleThicknessModifier_DistanceFromCamera *)new_m; LineStyleThicknessModifier_DistanceFromCamera *q = (LineStyleThicknessModifier_DistanceFromCamera *)new_m;
@@ -595,9 +595,9 @@ LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin
q->range_max = p->range_max; q->range_max = p->range_max;
q->value_min = p->value_min; q->value_min = p->value_min;
q->value_max = p->value_max; q->value_max = p->value_max;
break;
} }
break; case LS_MODIFIER_DISTANCE_FROM_OBJECT:
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
{ {
LineStyleThicknessModifier_DistanceFromObject *p = (LineStyleThicknessModifier_DistanceFromObject *)m; LineStyleThicknessModifier_DistanceFromObject *p = (LineStyleThicknessModifier_DistanceFromObject *)m;
LineStyleThicknessModifier_DistanceFromObject *q = (LineStyleThicknessModifier_DistanceFromObject *)new_m; LineStyleThicknessModifier_DistanceFromObject *q = (LineStyleThicknessModifier_DistanceFromObject *)new_m;
@@ -610,9 +610,9 @@ LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin
q->range_max = p->range_max; q->range_max = p->range_max;
q->value_min = p->value_min; q->value_min = p->value_min;
q->value_max = p->value_max; q->value_max = p->value_max;
break;
} }
break; case LS_MODIFIER_MATERIAL:
case LS_MODIFIER_MATERIAL:
{ {
LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m; LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m;
LineStyleThicknessModifier_Material *q = (LineStyleThicknessModifier_Material *)new_m; LineStyleThicknessModifier_Material *q = (LineStyleThicknessModifier_Material *)new_m;
@@ -621,19 +621,19 @@ LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin
q->mat_attr = p->mat_attr; q->mat_attr = p->mat_attr;
q->value_min = p->value_min; q->value_min = p->value_min;
q->value_max = p->value_max; q->value_max = p->value_max;
break;
} }
break; case LS_MODIFIER_CALLIGRAPHY:
case LS_MODIFIER_CALLIGRAPHY:
{ {
LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m; LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m;
LineStyleThicknessModifier_Calligraphy *q = (LineStyleThicknessModifier_Calligraphy *)new_m; LineStyleThicknessModifier_Calligraphy *q = (LineStyleThicknessModifier_Calligraphy *)new_m;
q->min_thickness = p->min_thickness; q->min_thickness = p->min_thickness;
q->max_thickness = p->max_thickness; q->max_thickness = p->max_thickness;
q->orientation = p->orientation; q->orientation = p->orientation;
break;
} }
break; default:
default: return NULL; /* unknown modifier type */
return NULL; /* unknown modifier type */
} }
add_to_modifier_list(&linestyle->thickness_modifiers, new_m); add_to_modifier_list(&linestyle->thickness_modifiers, new_m);
@@ -643,20 +643,20 @@ LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin
void BKE_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) void BKE_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m)
{ {
switch (m->type) { switch (m->type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
curvemapping_free(((LineStyleThicknessModifier_AlongStroke *)m)->curve); curvemapping_free(((LineStyleThicknessModifier_AlongStroke *)m)->curve);
break; break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA: case LS_MODIFIER_DISTANCE_FROM_CAMERA:
curvemapping_free(((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve); curvemapping_free(((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve);
break; break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT: case LS_MODIFIER_DISTANCE_FROM_OBJECT:
curvemapping_free(((LineStyleThicknessModifier_DistanceFromObject *)m)->curve); curvemapping_free(((LineStyleThicknessModifier_DistanceFromObject *)m)->curve);
break; break;
case LS_MODIFIER_MATERIAL: case LS_MODIFIER_MATERIAL:
curvemapping_free(((LineStyleThicknessModifier_Material *)m)->curve); curvemapping_free(((LineStyleThicknessModifier_Material *)m)->curve);
break; break;
case LS_MODIFIER_CALLIGRAPHY: case LS_MODIFIER_CALLIGRAPHY:
break; break;
} }
BLI_freelinkN(&linestyle->thickness_modifiers, m); BLI_freelinkN(&linestyle->thickness_modifiers, m);
} }
@@ -666,47 +666,47 @@ static LineStyleModifier *alloc_geometry_modifier(int type)
size_t size; size_t size;
switch (type) { switch (type) {
case LS_MODIFIER_SAMPLING: case LS_MODIFIER_SAMPLING:
size = sizeof(LineStyleGeometryModifier_Sampling); size = sizeof(LineStyleGeometryModifier_Sampling);
break; break;
case LS_MODIFIER_BEZIER_CURVE: case LS_MODIFIER_BEZIER_CURVE:
size = sizeof(LineStyleGeometryModifier_BezierCurve); size = sizeof(LineStyleGeometryModifier_BezierCurve);
break; break;
case LS_MODIFIER_SINUS_DISPLACEMENT: case LS_MODIFIER_SINUS_DISPLACEMENT:
size = sizeof(LineStyleGeometryModifier_SinusDisplacement); size = sizeof(LineStyleGeometryModifier_SinusDisplacement);
break; break;
case LS_MODIFIER_SPATIAL_NOISE: case LS_MODIFIER_SPATIAL_NOISE:
size = sizeof(LineStyleGeometryModifier_SpatialNoise); size = sizeof(LineStyleGeometryModifier_SpatialNoise);
break; break;
case LS_MODIFIER_PERLIN_NOISE_1D: case LS_MODIFIER_PERLIN_NOISE_1D:
size = sizeof(LineStyleGeometryModifier_PerlinNoise1D); size = sizeof(LineStyleGeometryModifier_PerlinNoise1D);
break; break;
case LS_MODIFIER_PERLIN_NOISE_2D: case LS_MODIFIER_PERLIN_NOISE_2D:
size = sizeof(LineStyleGeometryModifier_PerlinNoise2D); size = sizeof(LineStyleGeometryModifier_PerlinNoise2D);
break; break;
case LS_MODIFIER_BACKBONE_STRETCHER: case LS_MODIFIER_BACKBONE_STRETCHER:
size = sizeof(LineStyleGeometryModifier_BackboneStretcher); size = sizeof(LineStyleGeometryModifier_BackboneStretcher);
break; break;
case LS_MODIFIER_TIP_REMOVER: case LS_MODIFIER_TIP_REMOVER:
size = sizeof(LineStyleGeometryModifier_TipRemover); size = sizeof(LineStyleGeometryModifier_TipRemover);
break; break;
case LS_MODIFIER_POLYGONIZATION: case LS_MODIFIER_POLYGONIZATION:
size = sizeof(LineStyleGeometryModifier_Polygonalization); size = sizeof(LineStyleGeometryModifier_Polygonalization);
break; break;
case LS_MODIFIER_GUIDING_LINES: case LS_MODIFIER_GUIDING_LINES:
size = sizeof(LineStyleGeometryModifier_GuidingLines); size = sizeof(LineStyleGeometryModifier_GuidingLines);
break; break;
case LS_MODIFIER_BLUEPRINT: case LS_MODIFIER_BLUEPRINT:
size = sizeof(LineStyleGeometryModifier_Blueprint); size = sizeof(LineStyleGeometryModifier_Blueprint);
break; break;
case LS_MODIFIER_2D_OFFSET: case LS_MODIFIER_2D_OFFSET:
size = sizeof(LineStyleGeometryModifier_2DOffset); size = sizeof(LineStyleGeometryModifier_2DOffset);
break; break;
case LS_MODIFIER_2D_TRANSFORM: case LS_MODIFIER_2D_TRANSFORM:
size = sizeof(LineStyleGeometryModifier_2DTransform); size = sizeof(LineStyleGeometryModifier_2DTransform);
break; break;
default: default:
return NULL; /* unknown modifier type */ return NULL; /* unknown modifier type */
} }
return new_modifier(type, size); return new_modifier(type, size);
@@ -719,78 +719,78 @@ LineStyleModifier *BKE_add_linestyle_geometry_modifier(FreestyleLineStyle *lines
m = alloc_geometry_modifier(type); m = alloc_geometry_modifier(type);
switch (type) { switch (type) {
case LS_MODIFIER_SAMPLING: case LS_MODIFIER_SAMPLING:
{ {
LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m; LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m;
p->sampling = 10.0f; p->sampling = 10.0f;
break;
} }
break; case LS_MODIFIER_BEZIER_CURVE:
case LS_MODIFIER_BEZIER_CURVE:
{ {
LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m; LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m;
p->error = 10.0f; p->error = 10.0f;
break;
} }
break; case LS_MODIFIER_SINUS_DISPLACEMENT:
case LS_MODIFIER_SINUS_DISPLACEMENT:
{ {
LineStyleGeometryModifier_SinusDisplacement *p = (LineStyleGeometryModifier_SinusDisplacement *)m; LineStyleGeometryModifier_SinusDisplacement *p = (LineStyleGeometryModifier_SinusDisplacement *)m;
p->wavelength = 20.0f; p->wavelength = 20.0f;
p->amplitude = 5.0f; p->amplitude = 5.0f;
p->phase = 0.0f; p->phase = 0.0f;
break;
} }
break; case LS_MODIFIER_SPATIAL_NOISE:
case LS_MODIFIER_SPATIAL_NOISE:
{ {
LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m; LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m;
p->amplitude = 5.0f; p->amplitude = 5.0f;
p->scale = 20.0f; p->scale = 20.0f;
p->octaves = 4; p->octaves = 4;
p->flags = LS_MODIFIER_SPATIAL_NOISE_SMOOTH | LS_MODIFIER_SPATIAL_NOISE_PURERANDOM; p->flags = LS_MODIFIER_SPATIAL_NOISE_SMOOTH | LS_MODIFIER_SPATIAL_NOISE_PURERANDOM;
break;
} }
break; case LS_MODIFIER_PERLIN_NOISE_1D:
case LS_MODIFIER_PERLIN_NOISE_1D:
{ {
LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m; LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m;
p->frequency = 10.0f; p->frequency = 10.0f;
p->amplitude = 10.0f; p->amplitude = 10.0f;
p->octaves = 4; p->octaves = 4;
p->angle = DEG2RADF(45.0f); p->angle = DEG2RADF(45.0f);
break;
} }
break; case LS_MODIFIER_PERLIN_NOISE_2D:
case LS_MODIFIER_PERLIN_NOISE_2D:
{ {
LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m; LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m;
p->frequency = 10.0f; p->frequency = 10.0f;
p->amplitude = 10.0f; p->amplitude = 10.0f;
p->octaves = 4; p->octaves = 4;
p->angle = DEG2RADF(45.0f); p->angle = DEG2RADF(45.0f);
break;
} }
break; case LS_MODIFIER_BACKBONE_STRETCHER:
case LS_MODIFIER_BACKBONE_STRETCHER:
{ {
LineStyleGeometryModifier_BackboneStretcher *p = (LineStyleGeometryModifier_BackboneStretcher *)m; LineStyleGeometryModifier_BackboneStretcher *p = (LineStyleGeometryModifier_BackboneStretcher *)m;
p->backbone_length = 10.0f; p->backbone_length = 10.0f;
break;
} }
break; case LS_MODIFIER_TIP_REMOVER:
case LS_MODIFIER_TIP_REMOVER:
{ {
LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m; LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m;
p->tip_length = 10.0f; p->tip_length = 10.0f;
break;
} }
break; case LS_MODIFIER_POLYGONIZATION:
case LS_MODIFIER_POLYGONIZATION:
{ {
LineStyleGeometryModifier_Polygonalization *p = (LineStyleGeometryModifier_Polygonalization *)m; LineStyleGeometryModifier_Polygonalization *p = (LineStyleGeometryModifier_Polygonalization *)m;
p->error = 10.0f; p->error = 10.0f;
break;
} }
break; case LS_MODIFIER_GUIDING_LINES:
case LS_MODIFIER_GUIDING_LINES:
{ {
LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m; LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m;
p->offset = 0.0f; p->offset = 0.0f;
break;
} }
break; case LS_MODIFIER_BLUEPRINT:
case LS_MODIFIER_BLUEPRINT:
{ {
LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m; LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m;
p->flags = LS_MODIFIER_BLUEPRINT_CIRCLES; p->flags = LS_MODIFIER_BLUEPRINT_CIRCLES;
@@ -799,18 +799,18 @@ LineStyleModifier *BKE_add_linestyle_geometry_modifier(FreestyleLineStyle *lines
p->random_radius = 3; p->random_radius = 3;
p->random_center = 5; p->random_center = 5;
p->random_backbone = 5; p->random_backbone = 5;
break;
} }
break; case LS_MODIFIER_2D_OFFSET:
case LS_MODIFIER_2D_OFFSET:
{ {
LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m; LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m;
p->start = 0.0f; p->start = 0.0f;
p->end = 0.0f; p->end = 0.0f;
p->x = 0.0f; p->x = 0.0f;
p->y = 0.0f; p->y = 0.0f;
break;
} }
break; case LS_MODIFIER_2D_TRANSFORM:
case LS_MODIFIER_2D_TRANSFORM:
{ {
LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m; LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m;
p->pivot = LS_MODIFIER_2D_TRANSFORM_PIVOT_CENTER; p->pivot = LS_MODIFIER_2D_TRANSFORM_PIVOT_CENTER;
@@ -820,10 +820,10 @@ LineStyleModifier *BKE_add_linestyle_geometry_modifier(FreestyleLineStyle *lines
p->pivot_u = 0.5f; p->pivot_u = 0.5f;
p->pivot_x = 0.0f; p->pivot_x = 0.0f;
p->pivot_y = 0.0f; p->pivot_y = 0.0f;
break;
} }
break; default:
default: return NULL; /* unknown modifier type */
return NULL; /* unknown modifier type */
} }
add_to_modifier_list(&linestyle->geometry_modifiers, m); add_to_modifier_list(&linestyle->geometry_modifiers, m);
@@ -838,30 +838,30 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line
new_m->flags = m->flags; new_m->flags = m->flags;
switch (m->type) { switch (m->type) {
case LS_MODIFIER_SAMPLING: case LS_MODIFIER_SAMPLING:
{ {
LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m; LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m;
LineStyleGeometryModifier_Sampling *q = (LineStyleGeometryModifier_Sampling *)new_m; LineStyleGeometryModifier_Sampling *q = (LineStyleGeometryModifier_Sampling *)new_m;
q->sampling = p->sampling; q->sampling = p->sampling;
break;
} }
break; case LS_MODIFIER_BEZIER_CURVE:
case LS_MODIFIER_BEZIER_CURVE:
{ {
LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m; LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m;
LineStyleGeometryModifier_BezierCurve *q = (LineStyleGeometryModifier_BezierCurve *)new_m; LineStyleGeometryModifier_BezierCurve *q = (LineStyleGeometryModifier_BezierCurve *)new_m;
q->error = p->error; q->error = p->error;
break;
} }
break; case LS_MODIFIER_SINUS_DISPLACEMENT:
case LS_MODIFIER_SINUS_DISPLACEMENT:
{ {
LineStyleGeometryModifier_SinusDisplacement *p = (LineStyleGeometryModifier_SinusDisplacement *)m; LineStyleGeometryModifier_SinusDisplacement *p = (LineStyleGeometryModifier_SinusDisplacement *)m;
LineStyleGeometryModifier_SinusDisplacement *q = (LineStyleGeometryModifier_SinusDisplacement *)new_m; LineStyleGeometryModifier_SinusDisplacement *q = (LineStyleGeometryModifier_SinusDisplacement *)new_m;
q->wavelength = p->wavelength; q->wavelength = p->wavelength;
q->amplitude = p->amplitude; q->amplitude = p->amplitude;
q->phase = p->phase; q->phase = p->phase;
break;
} }
break; case LS_MODIFIER_SPATIAL_NOISE:
case LS_MODIFIER_SPATIAL_NOISE:
{ {
LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m; LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m;
LineStyleGeometryModifier_SpatialNoise *q = (LineStyleGeometryModifier_SpatialNoise *)new_m; LineStyleGeometryModifier_SpatialNoise *q = (LineStyleGeometryModifier_SpatialNoise *)new_m;
@@ -869,9 +869,9 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line
q->scale = p->scale; q->scale = p->scale;
q->octaves = p->octaves; q->octaves = p->octaves;
q->flags = p->flags; q->flags = p->flags;
break;
} }
break; case LS_MODIFIER_PERLIN_NOISE_1D:
case LS_MODIFIER_PERLIN_NOISE_1D:
{ {
LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m; LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m;
LineStyleGeometryModifier_PerlinNoise1D *q = (LineStyleGeometryModifier_PerlinNoise1D *)new_m; LineStyleGeometryModifier_PerlinNoise1D *q = (LineStyleGeometryModifier_PerlinNoise1D *)new_m;
@@ -880,9 +880,9 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line
q->angle = p->angle; q->angle = p->angle;
q->octaves = p->octaves; q->octaves = p->octaves;
q->seed = p->seed; q->seed = p->seed;
break;
} }
break; case LS_MODIFIER_PERLIN_NOISE_2D:
case LS_MODIFIER_PERLIN_NOISE_2D:
{ {
LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m; LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m;
LineStyleGeometryModifier_PerlinNoise2D *q = (LineStyleGeometryModifier_PerlinNoise2D *)new_m; LineStyleGeometryModifier_PerlinNoise2D *q = (LineStyleGeometryModifier_PerlinNoise2D *)new_m;
@@ -891,37 +891,37 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line
q->angle = p->angle; q->angle = p->angle;
q->octaves = p->octaves; q->octaves = p->octaves;
q->seed = p->seed; q->seed = p->seed;
break;
} }
break; case LS_MODIFIER_BACKBONE_STRETCHER:
case LS_MODIFIER_BACKBONE_STRETCHER:
{ {
LineStyleGeometryModifier_BackboneStretcher *p = (LineStyleGeometryModifier_BackboneStretcher *)m; LineStyleGeometryModifier_BackboneStretcher *p = (LineStyleGeometryModifier_BackboneStretcher *)m;
LineStyleGeometryModifier_BackboneStretcher *q = (LineStyleGeometryModifier_BackboneStretcher *)new_m; LineStyleGeometryModifier_BackboneStretcher *q = (LineStyleGeometryModifier_BackboneStretcher *)new_m;
q->backbone_length = p->backbone_length; q->backbone_length = p->backbone_length;
break;
} }
break; case LS_MODIFIER_TIP_REMOVER:
case LS_MODIFIER_TIP_REMOVER:
{ {
LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m; LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m;
LineStyleGeometryModifier_TipRemover *q = (LineStyleGeometryModifier_TipRemover *)new_m; LineStyleGeometryModifier_TipRemover *q = (LineStyleGeometryModifier_TipRemover *)new_m;
q->tip_length = p->tip_length; q->tip_length = p->tip_length;
break;
} }
break; case LS_MODIFIER_POLYGONIZATION:
case LS_MODIFIER_POLYGONIZATION:
{ {
LineStyleGeometryModifier_Polygonalization *p = (LineStyleGeometryModifier_Polygonalization *)m; LineStyleGeometryModifier_Polygonalization *p = (LineStyleGeometryModifier_Polygonalization *)m;
LineStyleGeometryModifier_Polygonalization *q = (LineStyleGeometryModifier_Polygonalization *)new_m; LineStyleGeometryModifier_Polygonalization *q = (LineStyleGeometryModifier_Polygonalization *)new_m;
q->error = p->error; q->error = p->error;
break;
} }
break; case LS_MODIFIER_GUIDING_LINES:
case LS_MODIFIER_GUIDING_LINES:
{ {
LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m; LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m;
LineStyleGeometryModifier_GuidingLines *q = (LineStyleGeometryModifier_GuidingLines *)new_m; LineStyleGeometryModifier_GuidingLines *q = (LineStyleGeometryModifier_GuidingLines *)new_m;
q->offset = p->offset; q->offset = p->offset;
break;
} }
break; case LS_MODIFIER_BLUEPRINT:
case LS_MODIFIER_BLUEPRINT:
{ {
LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m; LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m;
LineStyleGeometryModifier_Blueprint *q = (LineStyleGeometryModifier_Blueprint *)new_m; LineStyleGeometryModifier_Blueprint *q = (LineStyleGeometryModifier_Blueprint *)new_m;
@@ -931,9 +931,9 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line
q->random_radius = p->random_radius; q->random_radius = p->random_radius;
q->random_center = p->random_center; q->random_center = p->random_center;
q->random_backbone = p->random_backbone; q->random_backbone = p->random_backbone;
break;
} }
break; case LS_MODIFIER_2D_OFFSET:
case LS_MODIFIER_2D_OFFSET:
{ {
LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m; LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m;
LineStyleGeometryModifier_2DOffset *q = (LineStyleGeometryModifier_2DOffset *)new_m; LineStyleGeometryModifier_2DOffset *q = (LineStyleGeometryModifier_2DOffset *)new_m;
@@ -941,9 +941,9 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line
q->end = p->end; q->end = p->end;
q->x = p->x; q->x = p->x;
q->y = p->y; q->y = p->y;
break;
} }
break; case LS_MODIFIER_2D_TRANSFORM:
case LS_MODIFIER_2D_TRANSFORM:
{ {
LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m; LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m;
LineStyleGeometryModifier_2DTransform *q = (LineStyleGeometryModifier_2DTransform *)new_m; LineStyleGeometryModifier_2DTransform *q = (LineStyleGeometryModifier_2DTransform *)new_m;
@@ -954,10 +954,10 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line
q->pivot_u = p->pivot_u; q->pivot_u = p->pivot_u;
q->pivot_x = p->pivot_x; q->pivot_x = p->pivot_x;
q->pivot_y = p->pivot_y; q->pivot_y = p->pivot_y;
break;
} }
break; default:
default: return NULL; /* unknown modifier type */
return NULL; /* unknown modifier type */
} }
add_to_modifier_list(&linestyle->geometry_modifiers, new_m); add_to_modifier_list(&linestyle->geometry_modifiers, new_m);
@@ -1007,20 +1007,20 @@ void BKE_list_modifier_color_ramps(FreestyleLineStyle *linestyle, ListBase *list
listbase->first = listbase->last = NULL; listbase->first = listbase->last = NULL;
for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) { for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) {
switch (m->type) { switch (m->type) {
case LS_MODIFIER_ALONG_STROKE: case LS_MODIFIER_ALONG_STROKE:
color_ramp = ((LineStyleColorModifier_AlongStroke *)m)->color_ramp; color_ramp = ((LineStyleColorModifier_AlongStroke *)m)->color_ramp;
break; break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA: case LS_MODIFIER_DISTANCE_FROM_CAMERA:
color_ramp = ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp; color_ramp = ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp;
break; break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT: case LS_MODIFIER_DISTANCE_FROM_OBJECT:
color_ramp = ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp; color_ramp = ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp;
break; break;
case LS_MODIFIER_MATERIAL: case LS_MODIFIER_MATERIAL:
color_ramp = ((LineStyleColorModifier_Material *)m)->color_ramp; color_ramp = ((LineStyleColorModifier_Material *)m)->color_ramp;
break; break;
default: default:
continue; continue;
} }
link = (LinkData *) MEM_callocN( sizeof(LinkData), "link to color ramp"); link = (LinkData *) MEM_callocN( sizeof(LinkData), "link to color ramp");
link->data = color_ramp; link->data = color_ramp;

10
source/blender/blenkernel/intern/material.c
View File

@@ -1430,8 +1430,8 @@ void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
r_col[1] = facm * (r_col[1]) + fac * tmpg; r_col[1] = facm * (r_col[1]) + fac * tmpg;
r_col[2] = facm * (r_col[2]) + fac * tmpb; r_col[2] = facm * (r_col[2]) + fac * tmpb;
} }
break;
} }
break;
case MA_RAMP_SAT: case MA_RAMP_SAT:
{ {
float rH, rS, rV; float rH, rS, rV;
@@ -1441,8 +1441,8 @@ void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
rgb_to_hsv(col[0], col[1], col[2], &colH, &colS, &colV); rgb_to_hsv(col[0], col[1], col[2], &colH, &colS, &colV);
hsv_to_rgb(rH, (facm * rS + fac * colS), rV, r_col + 0, r_col + 1, r_col + 2); hsv_to_rgb(rH, (facm * rS + fac * colS), rV, r_col + 0, r_col + 1, r_col + 2);
} }
break;
} }
break;
case MA_RAMP_VAL: case MA_RAMP_VAL:
{ {
float rH, rS, rV; float rH, rS, rV;
@@ -1450,8 +1450,8 @@ void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
rgb_to_hsv(r_col[0], r_col[1], r_col[2], &rH, &rS, &rV); rgb_to_hsv(r_col[0], r_col[1], r_col[2], &rH, &rS, &rV);
rgb_to_hsv(col[0], col[1], col[2], &colH, &colS, &colV); rgb_to_hsv(col[0], col[1], col[2], &colH, &colS, &colV);
hsv_to_rgb(rH, rS, (facm * rV + fac * colV), r_col + 0, r_col + 1, r_col + 2); hsv_to_rgb(rH, rS, (facm * rV + fac * colV), r_col + 0, r_col + 1, r_col + 2);
break;
} }
break;
case MA_RAMP_COLOR: case MA_RAMP_COLOR:
{ {
float rH, rS, rV; float rH, rS, rV;
@@ -1465,8 +1465,8 @@ void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
r_col[1] = facm * (r_col[1]) + fac * tmpg; r_col[1] = facm * (r_col[1]) + fac * tmpg;
r_col[2] = facm * (r_col[2]) + fac * tmpb; r_col[2] = facm * (r_col[2]) + fac * tmpb;
} }
break;
} }
break;
case MA_RAMP_SOFT: case MA_RAMP_SOFT:
{ {
float scr, scg, scb; float scr, scg, scb;
@@ -1479,8 +1479,8 @@ void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
r_col[0] = facm * (r_col[0]) + fac * (((1.0f - r_col[0]) * col[0] * (r_col[0])) + (r_col[0] * scr)); r_col[0] = facm * (r_col[0]) + fac * (((1.0f - r_col[0]) * col[0] * (r_col[0])) + (r_col[0] * scr));
r_col[1] = facm * (r_col[1]) + fac * (((1.0f - r_col[1]) * col[1] * (r_col[1])) + (r_col[1] * scg)); r_col[1] = facm * (r_col[1]) + fac * (((1.0f - r_col[1]) * col[1] * (r_col[1])) + (r_col[1] * scg));
r_col[2] = facm * (r_col[2]) + fac * (((1.0f - r_col[2]) * col[2] * (r_col[2])) + (r_col[2] * scb)); r_col[2] = facm * (r_col[2]) + fac * (((1.0f - r_col[2]) * col[2] * (r_col[2])) + (r_col[2] * scb));
break;
} }
break;
case MA_RAMP_LINEAR: case MA_RAMP_LINEAR:
if (col[0] > 0.5f) if (col[0] > 0.5f)
r_col[0] = r_col[0] + fac * (2.0f * (col[0] - 0.5f)); r_col[0] = r_col[0] + fac * (2.0f * (col[0] - 0.5f));

216
source/blender/blenkernel/intern/node.c
View File

@@ -525,60 +525,60 @@ bNodeSocket *nodeInsertSocket(bNodeTree *ntree, bNode *node, int in_out, const c
const char *nodeStaticSocketType(int type, int subtype) const char *nodeStaticSocketType(int type, int subtype)
{ {
switch (type) { switch (type) {
case SOCK_FLOAT: case SOCK_FLOAT:
switch (subtype) { switch (subtype) {
case PROP_UNSIGNED: case PROP_UNSIGNED:
return "NodeSocketFloatUnsigned"; return "NodeSocketFloatUnsigned";
case PROP_PERCENTAGE: case PROP_PERCENTAGE:
return "NodeSocketFloatPercentage"; return "NodeSocketFloatPercentage";
case PROP_FACTOR: case PROP_FACTOR:
return "NodeSocketFloatFactor"; return "NodeSocketFloatFactor";
case PROP_ANGLE: case PROP_ANGLE:
return "NodeSocketFloatAngle"; return "NodeSocketFloatAngle";
case PROP_TIME: case PROP_TIME:
return "NodeSocketFloatTime"; return "NodeSocketFloatTime";
case PROP_NONE: case PROP_NONE:
default: default:
return "NodeSocketFloat"; return "NodeSocketFloat";
} }
case SOCK_INT: case SOCK_INT:
switch (subtype) { switch (subtype) {
case PROP_UNSIGNED: case PROP_UNSIGNED:
return "NodeSocketIntUnsigned"; return "NodeSocketIntUnsigned";
case PROP_PERCENTAGE: case PROP_PERCENTAGE:
return "NodeSocketIntPercentage"; return "NodeSocketIntPercentage";
case PROP_FACTOR: case PROP_FACTOR:
return "NodeSocketIntFactor"; return "NodeSocketIntFactor";
case PROP_NONE: case PROP_NONE:
default: default:
return "NodeSocketInt"; return "NodeSocketInt";
} }
case SOCK_BOOLEAN: case SOCK_BOOLEAN:
return "NodeSocketBool"; return "NodeSocketBool";
case SOCK_VECTOR: case SOCK_VECTOR:
switch (subtype) { switch (subtype) {
case PROP_TRANSLATION: case PROP_TRANSLATION:
return "NodeSocketVectorTranslation"; return "NodeSocketVectorTranslation";
case PROP_DIRECTION: case PROP_DIRECTION:
return "NodeSocketVectorDirection"; return "NodeSocketVectorDirection";
case PROP_VELOCITY: case PROP_VELOCITY:
return "NodeSocketVectorVelocity"; return "NodeSocketVectorVelocity";
case PROP_ACCELERATION: case PROP_ACCELERATION:
return "NodeSocketVectorAcceleration"; return "NodeSocketVectorAcceleration";
case PROP_EULER: case PROP_EULER:
return "NodeSocketVectorEuler"; return "NodeSocketVectorEuler";
case PROP_XYZ: case PROP_XYZ:
return "NodeSocketVectorXYZ"; return "NodeSocketVectorXYZ";
case PROP_NONE: case PROP_NONE:
default: default:
return "NodeSocketVector"; return "NodeSocketVector";
} }
case SOCK_RGBA: case SOCK_RGBA:
return "NodeSocketColor"; return "NodeSocketColor";
case SOCK_STRING: case SOCK_STRING:
return "NodeSocketString"; return "NodeSocketString";
case SOCK_SHADER: case SOCK_SHADER:
return "NodeSocketShader"; return "NodeSocketShader";
} }
return NULL; return NULL;
} }
@@ -586,60 +586,60 @@ const char *nodeStaticSocketType(int type, int subtype)
const char *nodeStaticSocketInterfaceType(int type, int subtype) const char *nodeStaticSocketInterfaceType(int type, int subtype)
{ {
switch (type) { switch (type) {
case SOCK_FLOAT: case SOCK_FLOAT:
switch (subtype) { switch (subtype) {
case PROP_UNSIGNED: case PROP_UNSIGNED:
return "NodeSocketInterfaceFloatUnsigned"; return "NodeSocketInterfaceFloatUnsigned";
case PROP_PERCENTAGE: case PROP_PERCENTAGE:
return "NodeSocketInterfaceFloatPercentage"; return "NodeSocketInterfaceFloatPercentage";
case PROP_FACTOR: case PROP_FACTOR:
return "NodeSocketInterfaceFloatFactor"; return "NodeSocketInterfaceFloatFactor";
case PROP_ANGLE: case PROP_ANGLE:
return "NodeSocketInterfaceFloatAngle"; return "NodeSocketInterfaceFloatAngle";
case PROP_TIME: case PROP_TIME:
return "NodeSocketInterfaceFloatTime"; return "NodeSocketInterfaceFloatTime";
case PROP_NONE: case PROP_NONE:
default: default:
return "NodeSocketInterfaceFloat"; return "NodeSocketInterfaceFloat";
} }
case SOCK_INT: case SOCK_INT:
switch (subtype) { switch (subtype) {
case PROP_UNSIGNED: case PROP_UNSIGNED:
return "NodeSocketInterfaceIntUnsigned"; return "NodeSocketInterfaceIntUnsigned";
case PROP_PERCENTAGE: case PROP_PERCENTAGE:
return "NodeSocketInterfaceIntPercentage"; return "NodeSocketInterfaceIntPercentage";
case PROP_FACTOR: case PROP_FACTOR:
return "NodeSocketInterfaceIntFactor"; return "NodeSocketInterfaceIntFactor";
case PROP_NONE: case PROP_NONE:
default: default:
return "NodeSocketInterfaceInt"; return "NodeSocketInterfaceInt";
} }
case SOCK_BOOLEAN: case SOCK_BOOLEAN:
return "NodeSocketInterfaceBool"; return "NodeSocketInterfaceBool";
case SOCK_VECTOR: case SOCK_VECTOR:
switch (subtype) { switch (subtype) {
case PROP_TRANSLATION: case PROP_TRANSLATION:
return "NodeSocketInterfaceVectorTranslation"; return "NodeSocketInterfaceVectorTranslation";
case PROP_DIRECTION: case PROP_DIRECTION:
return "NodeSocketInterfaceVectorDirection"; return "NodeSocketInterfaceVectorDirection";
case PROP_VELOCITY: case PROP_VELOCITY:
return "NodeSocketInterfaceVectorVelocity"; return "NodeSocketInterfaceVectorVelocity";
case PROP_ACCELERATION: case PROP_ACCELERATION:
return "NodeSocketInterfaceVectorAcceleration"; return "NodeSocketInterfaceVectorAcceleration";
case PROP_EULER: case PROP_EULER:
return "NodeSocketInterfaceVectorEuler"; return "NodeSocketInterfaceVectorEuler";
case PROP_XYZ: case PROP_XYZ:
return "NodeSocketInterfaceVectorXYZ"; return "NodeSocketInterfaceVectorXYZ";
case PROP_NONE: case PROP_NONE:
default: default:
return "NodeSocketInterfaceVector"; return "NodeSocketInterfaceVector";
} }
case SOCK_RGBA: case SOCK_RGBA:
return "NodeSocketInterfaceColor"; return "NodeSocketInterfaceColor";
case SOCK_STRING: case SOCK_STRING:
return "NodeSocketInterfaceString"; return "NodeSocketInterfaceString";
case SOCK_SHADER: case SOCK_SHADER:
return "NodeSocketInterfaceShader"; return "NodeSocketInterfaceShader";
} }
return NULL; return NULL;
} }

8
source/blender/blenkernel/intern/object.c
View File

@@ -1589,13 +1589,15 @@ void BKE_object_mat3_to_rot(Object *ob, float mat[3][3], bool use_compat)
normalize_qt_qt(dquat, ob->dquat); normalize_qt_qt(dquat, ob->dquat);
invert_qt(dquat); invert_qt(dquat);
mul_qt_qtqt(ob->quat, dquat, ob->quat); mul_qt_qtqt(ob->quat, dquat, ob->quat);
break;
} }
break;
case ROT_MODE_AXISANGLE: case ROT_MODE_AXISANGLE:
{
mat3_to_axis_angle(ob->rotAxis, &ob->rotAngle, mat); mat3_to_axis_angle(ob->rotAxis, &ob->rotAngle, mat);
sub_v3_v3(ob->rotAxis, ob->drotAxis); sub_v3_v3(ob->rotAxis, ob->drotAxis);
ob->rotAngle -= ob->drotAngle; ob->rotAngle -= ob->drotAngle;
break; break;
}
default: /* euler */ default: /* euler */
{ {
float quat[4]; float quat[4];
@@ -2724,10 +2726,8 @@ void BKE_object_handle_update_ex(Scene *scene, Object *ob,
makeDerivedMesh(scene, ob, NULL, data_mask, 0); makeDerivedMesh(scene, ob, NULL, data_mask, 0);
} }
#endif #endif
break;
} }
break;
case OB_ARMATURE: case OB_ARMATURE:
if (ob->id.lib && ob->proxy_from) { if (ob->id.lib && ob->proxy_from) {
if (BKE_pose_copy_result(ob->pose, ob->proxy_from->pose) == false) { if (BKE_pose_copy_result(ob->pose, ob->proxy_from->pose) == false) {

34
source/blender/blenkernel/intern/writeffmpeg.c
View File

@@ -1072,23 +1072,23 @@ int BKE_ffmpeg_start(struct Scene *scene, RenderData *rd, int rectx, int recty,
specs.channels = c->channels; specs.channels = c->channels;
switch (av_get_packed_sample_fmt(c->sample_fmt)) { switch (av_get_packed_sample_fmt(c->sample_fmt)) {
case AV_SAMPLE_FMT_U8: case AV_SAMPLE_FMT_U8:
specs.format = AUD_FORMAT_U8; specs.format = AUD_FORMAT_U8;
break; break;
case AV_SAMPLE_FMT_S16: case AV_SAMPLE_FMT_S16:
specs.format = AUD_FORMAT_S16; specs.format = AUD_FORMAT_S16;
break; break;
case AV_SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32:
specs.format = AUD_FORMAT_S32; specs.format = AUD_FORMAT_S32;
break; break;
case AV_SAMPLE_FMT_FLT: case AV_SAMPLE_FMT_FLT:
specs.format = AUD_FORMAT_FLOAT32; specs.format = AUD_FORMAT_FLOAT32;
break; break;
case AV_SAMPLE_FMT_DBL: case AV_SAMPLE_FMT_DBL:
specs.format = AUD_FORMAT_FLOAT64; specs.format = AUD_FORMAT_FLOAT64;
break; break;
default: default:
return -31415; return -31415;
} }
specs.rate = rd->ffcodecdata.audio_mixrate; specs.rate = rd->ffcodecdata.audio_mixrate;

8
source/blender/blenlib/intern/DLRB_tree.c
View File

@@ -539,9 +539,8 @@ DLRBT_Node *BLI_dlrbTree_add(DLRBT_Tree *tree, DLRBT_Comparator_FP cmp_cb,
parNode->left = node; parNode->left = node;
node->parent = parNode; node->parent = parNode;
break;
} }
break;
case 1: /* add new node as right child */ case 1: /* add new node as right child */
{ {
node = new_cb(data); node = new_cb(data);
@@ -549,15 +548,14 @@ DLRBT_Node *BLI_dlrbTree_add(DLRBT_Tree *tree, DLRBT_Comparator_FP cmp_cb,
parNode->right = node; parNode->right = node;
node->parent = parNode; node->parent = parNode;
break;
} }
break;
default: /* update the duplicate node as appropriate */ default: /* update the duplicate node as appropriate */
{ {
if (update_cb) if (update_cb)
update_cb(parNode, data); update_cb(parNode, data);
break;
} }
break;
} }
} }
else { else {

4
source/blender/compositor/intern/COM_ExecutionGroup.cpp
View File

@@ -288,8 +288,8 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
delete hotspots[0]; delete hotspots[0];
MEM_freeN(chunkOrders); MEM_freeN(chunkOrders);
break;
} }
break;
case COM_TO_RULE_OF_THIRDS: case COM_TO_RULE_OF_THIRDS:
{ {
ChunkOrderHotspot *hotspots[9]; ChunkOrderHotspot *hotspots[9];
@@ -336,8 +336,8 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
delete hotspots[7]; delete hotspots[7];
delete hotspots[8]; delete hotspots[8];
MEM_freeN(chunkOrders); MEM_freeN(chunkOrders);
break;
} }
break;
case COM_TO_TOP_DOWN: case COM_TO_TOP_DOWN:
default: default:
break; break;

24
source/blender/editors/animation/anim_channels_defines.c
View File

@@ -2921,9 +2921,8 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
return ((*val) & flag) == 0; return ((*val) & flag) == 0;
else else
return ((*val) & flag) != 0; return ((*val) & flag) != 0;
break;
} }
break;
case sizeof(short): /* short pointer for setting */ case sizeof(short): /* short pointer for setting */
{ {
short *val = (short *)ptr; short *val = (short *)ptr;
@@ -2932,9 +2931,8 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
return ((*val) & flag) == 0; return ((*val) & flag) == 0;
else else
return ((*val) & flag) != 0; return ((*val) & flag) != 0;
break;
} }
break;
case sizeof(char): /* char pointer for setting */ case sizeof(char): /* char pointer for setting */
{ {
char *val = (char *)ptr; char *val = (char *)ptr;
@@ -2943,8 +2941,8 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
return ((*val) & flag) == 0; return ((*val) & flag) == 0;
else else
return ((*val) & flag) != 0; return ((*val) & flag) != 0;
break;
} }
break;
} }
} }
} }
@@ -2994,22 +2992,20 @@ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting,
{ {
int *val = (int *)ptr; int *val = (int *)ptr;
ACF_SETTING_SET(*val, flag, mode); ACF_SETTING_SET(*val, flag, mode);
break;
} }
break;
case sizeof(short): /* short pointer for setting */ case sizeof(short): /* short pointer for setting */
{ {
short *val = (short *)ptr; short *val = (short *)ptr;
ACF_SETTING_SET(*val, flag, mode); ACF_SETTING_SET(*val, flag, mode);
break;
} }
break;
case sizeof(char): /* char pointer for setting */ case sizeof(char): /* char pointer for setting */
{ {
char *val = (char *)ptr; char *val = (char *)ptr;
ACF_SETTING_SET(*val, flag, mode); ACF_SETTING_SET(*val, flag, mode);
break;
} }
break;
} }
} }
} }
@@ -3156,14 +3152,14 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
{ {
SpaceAction *saction = (SpaceAction *)ac->sl; SpaceAction *saction = (SpaceAction *)ac->sl;
draw_sliders = (saction->flag & SACTION_SLIDERS); draw_sliders = (saction->flag & SACTION_SLIDERS);
break;
} }
break;
case SPACE_IPO: case SPACE_IPO:
{ {
SpaceIpo *sipo = (SpaceIpo *)ac->sl; SpaceIpo *sipo = (SpaceIpo *)ac->sl;
draw_sliders = (sipo->flag & SIPO_SLIDERS); draw_sliders = (sipo->flag & SIPO_SLIDERS);
break;
} }
break;
} }
} }
@@ -3546,14 +3542,14 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
{ {
SpaceAction *saction = (SpaceAction *)ac->sl; SpaceAction *saction = (SpaceAction *)ac->sl;
draw_sliders = (saction->flag & SACTION_SLIDERS); draw_sliders = (saction->flag & SACTION_SLIDERS);
break;
} }
break;
case SPACE_IPO: case SPACE_IPO:
{ {
SpaceIpo *sipo = (SpaceIpo *)ac->sl; SpaceIpo *sipo = (SpaceIpo *)ac->sl;
draw_sliders = (sipo->flag & SIPO_SLIDERS); draw_sliders = (sipo->flag & SIPO_SLIDERS);
break;
} }
break;
} }
} }

101
source/blender/editors/animation/anim_channels_edit.c
View File

@@ -94,23 +94,22 @@ void ANIM_set_active_channel(bAnimContext *ac, void *data, short datatype, int f
bActionGroup *agrp = (bActionGroup *)ale->data; bActionGroup *agrp = (bActionGroup *)ale->data;
ACHANNEL_SET_FLAG(agrp, ACHANNEL_SETFLAG_CLEAR, AGRP_ACTIVE); ACHANNEL_SET_FLAG(agrp, ACHANNEL_SETFLAG_CLEAR, AGRP_ACTIVE);
break;
} }
break;
case ANIMTYPE_FCURVE: case ANIMTYPE_FCURVE:
{ {
FCurve *fcu = (FCurve *)ale->data; FCurve *fcu = (FCurve *)ale->data;
ACHANNEL_SET_FLAG(fcu, ACHANNEL_SETFLAG_CLEAR, FCURVE_ACTIVE); ACHANNEL_SET_FLAG(fcu, ACHANNEL_SETFLAG_CLEAR, FCURVE_ACTIVE);
break;
} }
break;
case ANIMTYPE_NLATRACK: case ANIMTYPE_NLATRACK:
{ {
NlaTrack *nlt = (NlaTrack *)ale->data; NlaTrack *nlt = (NlaTrack *)ale->data;
ACHANNEL_SET_FLAG(nlt, ACHANNEL_SETFLAG_CLEAR, NLATRACK_ACTIVE); ACHANNEL_SET_FLAG(nlt, ACHANNEL_SETFLAG_CLEAR, NLATRACK_ACTIVE);
break;
} }
break;
case ANIMTYPE_FILLACTD: /* Action Expander */ case ANIMTYPE_FILLACTD: /* Action Expander */
case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */ case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */
case ANIMTYPE_DSLAM: case ANIMTYPE_DSLAM:
@@ -131,8 +130,8 @@ void ANIM_set_active_channel(bAnimContext *ac, void *data, short datatype, int f
if (ale->adt) { if (ale->adt) {
ACHANNEL_SET_FLAG(ale->adt, ACHANNEL_SETFLAG_CLEAR, ADT_UI_ACTIVE); ACHANNEL_SET_FLAG(ale->adt, ACHANNEL_SETFLAG_CLEAR, ADT_UI_ACTIVE);
} }
break;
} }
break;
} }
} }
@@ -143,21 +142,20 @@ void ANIM_set_active_channel(bAnimContext *ac, void *data, short datatype, int f
{ {
bActionGroup *agrp = (bActionGroup *)channel_data; bActionGroup *agrp = (bActionGroup *)channel_data;
agrp->flag |= AGRP_ACTIVE; agrp->flag |= AGRP_ACTIVE;
break;
} }
break;
case ANIMTYPE_FCURVE: case ANIMTYPE_FCURVE:
{ {
FCurve *fcu = (FCurve *)channel_data; FCurve *fcu = (FCurve *)channel_data;
fcu->flag |= FCURVE_ACTIVE; fcu->flag |= FCURVE_ACTIVE;
break;
} }
break;
case ANIMTYPE_NLATRACK: case ANIMTYPE_NLATRACK:
{ {
NlaTrack *nlt = (NlaTrack *)channel_data; NlaTrack *nlt = (NlaTrack *)channel_data;
nlt->flag |= NLATRACK_ACTIVE; nlt->flag |= NLATRACK_ACTIVE;
break;
} }
break;
case ANIMTYPE_FILLACTD: /* Action Expander */ case ANIMTYPE_FILLACTD: /* Action Expander */
case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */ case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */
case ANIMTYPE_DSLAM: case ANIMTYPE_DSLAM:
@@ -177,8 +175,8 @@ void ANIM_set_active_channel(bAnimContext *ac, void *data, short datatype, int f
if (ale && ale->adt) { if (ale && ale->adt) {
ale->adt->flag |= ADT_UI_ACTIVE; ale->adt->flag |= ADT_UI_ACTIVE;
} }
break;
} }
break;
} }
} }
@@ -256,9 +254,8 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s
{ {
if ((ale->adt) && (ale->adt->flag & ADT_UI_SELECTED)) if ((ale->adt) && (ale->adt->flag & ADT_UI_SELECTED))
sel = ACHANNEL_SETFLAG_CLEAR; sel = ACHANNEL_SETFLAG_CLEAR;
break;
} }
break;
case ANIMTYPE_GPLAYER: case ANIMTYPE_GPLAYER:
if (ale->flag & GP_LAYER_SELECT) if (ale->flag & GP_LAYER_SELECT)
sel = ACHANNEL_SETFLAG_CLEAR; sel = ACHANNEL_SETFLAG_CLEAR;
@@ -283,55 +280,54 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s
if (scene->adt) { if (scene->adt) {
ACHANNEL_SET_FLAG(scene, sel, ADT_UI_SELECTED); ACHANNEL_SET_FLAG(scene, sel, ADT_UI_SELECTED);
} }
break;
} }
break;
case ANIMTYPE_OBJECT: case ANIMTYPE_OBJECT:
{
#if 0 /* for now, do not take object selection into account, since it gets too annoying */ #if 0 /* for now, do not take object selection into account, since it gets too annoying */
{ Base *base = (Base *)ale->data;
Base *base = (Base *)ale->data; Object *ob = base->object;
Object *ob = base->object;
ACHANNEL_SET_FLAG(base, sel, SELECT);
ACHANNEL_SET_FLAG(base, sel, SELECT); ACHANNEL_SET_FLAG(ob, sel, SELECT);
ACHANNEL_SET_FLAG(ob, sel, SELECT);
if (ob->adt) {
if (ob->adt) { ACHANNEL_SET_FLAG(ob, sel, ADT_UI_SELECTED);
ACHANNEL_SET_FLAG(ob, sel, ADT_UI_SELECTED);
}
} }
#endif #endif
break; break;
}
case ANIMTYPE_GROUP: case ANIMTYPE_GROUP:
{ {
bActionGroup *agrp = (bActionGroup *)ale->data; bActionGroup *agrp = (bActionGroup *)ale->data;
ACHANNEL_SET_FLAG(agrp, sel, AGRP_SELECTED); ACHANNEL_SET_FLAG(agrp, sel, AGRP_SELECTED);
agrp->flag &= ~AGRP_ACTIVE; agrp->flag &= ~AGRP_ACTIVE;
break;
} }
break;
case ANIMTYPE_FCURVE: case ANIMTYPE_FCURVE:
{ {
FCurve *fcu = (FCurve *)ale->data; FCurve *fcu = (FCurve *)ale->data;
ACHANNEL_SET_FLAG(fcu, sel, FCURVE_SELECTED); ACHANNEL_SET_FLAG(fcu, sel, FCURVE_SELECTED);
fcu->flag &= ~FCURVE_ACTIVE; fcu->flag &= ~FCURVE_ACTIVE;
break;
} }
break;
case ANIMTYPE_SHAPEKEY: case ANIMTYPE_SHAPEKEY:
{ {
KeyBlock *kb = (KeyBlock *)ale->data; KeyBlock *kb = (KeyBlock *)ale->data;
ACHANNEL_SET_FLAG(kb, sel, KEYBLOCK_SEL); ACHANNEL_SET_FLAG(kb, sel, KEYBLOCK_SEL);
break;
} }
break;
case ANIMTYPE_NLATRACK: case ANIMTYPE_NLATRACK:
{ {
NlaTrack *nlt = (NlaTrack *)ale->data; NlaTrack *nlt = (NlaTrack *)ale->data;
ACHANNEL_SET_FLAG(nlt, sel, NLATRACK_SELECTED); ACHANNEL_SET_FLAG(nlt, sel, NLATRACK_SELECTED);
nlt->flag &= ~NLATRACK_ACTIVE; nlt->flag &= ~NLATRACK_ACTIVE;
break;
} }
break;
case ANIMTYPE_FILLACTD: /* Action Expander */ case ANIMTYPE_FILLACTD: /* Action Expander */
case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */ case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */
case ANIMTYPE_DSLAM: case ANIMTYPE_DSLAM:
@@ -354,24 +350,22 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s
ACHANNEL_SET_FLAG(ale->adt, sel, ADT_UI_SELECTED); ACHANNEL_SET_FLAG(ale->adt, sel, ADT_UI_SELECTED);
ale->adt->flag &= ~ADT_UI_ACTIVE; ale->adt->flag &= ~ADT_UI_ACTIVE;
} }
break;
} }
break;
case ANIMTYPE_GPLAYER: case ANIMTYPE_GPLAYER:
{ {
bGPDlayer *gpl = (bGPDlayer *)ale->data; bGPDlayer *gpl = (bGPDlayer *)ale->data;
ACHANNEL_SET_FLAG(gpl, sel, GP_LAYER_SELECT); ACHANNEL_SET_FLAG(gpl, sel, GP_LAYER_SELECT);
break;
} }
break;
case ANIMTYPE_MASKLAYER: case ANIMTYPE_MASKLAYER:
{ {
MaskLayer *masklay = (MaskLayer *)ale->data; MaskLayer *masklay = (MaskLayer *)ale->data;
ACHANNEL_SET_FLAG(masklay, sel, MASK_LAYERFLAG_SELECT); ACHANNEL_SET_FLAG(masklay, sel, MASK_LAYERFLAG_SELECT);
break;
} }
break;
} }
} }
@@ -801,23 +795,22 @@ static void rearrange_animchannel_add_to_islands(ListBase *islands, ListBase *sr
is_sel = SEL_AGRP(agrp); is_sel = SEL_AGRP(agrp);
is_untouchable = (agrp->flag & AGRP_TEMP) != 0; is_untouchable = (agrp->flag & AGRP_TEMP) != 0;
break;
} }
break;
case ANIMTYPE_FCURVE: case ANIMTYPE_FCURVE:
{ {
FCurve *fcu = (FCurve *)channel; FCurve *fcu = (FCurve *)channel;
is_sel = SEL_FCU(fcu); is_sel = SEL_FCU(fcu);
break;
} }
break;
case ANIMTYPE_NLATRACK: case ANIMTYPE_NLATRACK:
{ {
NlaTrack *nlt = (NlaTrack *)channel; NlaTrack *nlt = (NlaTrack *)channel;
is_sel = SEL_NLT(nlt); is_sel = SEL_NLT(nlt);
break;
} }
break;
default: default:
printf("rearrange_animchannel_add_to_islands(): don't know how to handle channels of type %d\n", type); printf("rearrange_animchannel_add_to_islands(): don't know how to handle channels of type %d\n", type);
return; return;
@@ -1435,9 +1428,8 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op))
/* try to free F-Curve */ /* try to free F-Curve */
ANIM_fcurve_delete_from_animdata(&ac, adt, fcu); ANIM_fcurve_delete_from_animdata(&ac, adt, fcu);
break;
} }
break;
case ANIMTYPE_GPLAYER: case ANIMTYPE_GPLAYER:
{ {
/* Grease Pencil layer */ /* Grease Pencil layer */
@@ -1447,9 +1439,8 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op))
/* try to delete the layer's data and the layer itself */ /* try to delete the layer's data and the layer itself */
free_gpencil_frames(gpl); free_gpencil_frames(gpl);
BLI_freelinkN(&gpd->layers, gpl); BLI_freelinkN(&gpd->layers, gpl);
break;
} }
break;
case ANIMTYPE_MASKLAYER: case ANIMTYPE_MASKLAYER:
{ {
/* Mask layer */ /* Mask layer */
@@ -1458,8 +1449,8 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op))
/* try to delete the layer's data and the layer itself */ /* try to delete the layer's data and the layer itself */
BKE_mask_layer_remove(mask, masklay); BKE_mask_layer_remove(mask, masklay);
break;
} }
break;
} }
} }
@@ -2131,8 +2122,8 @@ static void borderselect_anim_channels(bAnimContext *ac, rcti *rect, short selec
/* always clear active flag after doing this */ /* always clear active flag after doing this */
agrp->flag &= ~AGRP_ACTIVE; agrp->flag &= ~AGRP_ACTIVE;
break;
} }
break;
case ANIMTYPE_NLATRACK: case ANIMTYPE_NLATRACK:
{ {
NlaTrack *nlt = (NlaTrack *)ale->data; NlaTrack *nlt = (NlaTrack *)ale->data;
@@ -2141,8 +2132,8 @@ static void borderselect_anim_channels(bAnimContext *ac, rcti *rect, short selec
* currently adds complications when doing other stuff * currently adds complications when doing other stuff
*/ */
ACHANNEL_SET_FLAG(nlt, selectmode, NLATRACK_SELECTED); ACHANNEL_SET_FLAG(nlt, selectmode, NLATRACK_SELECTED);
break;
} }
break;
} }
} }
@@ -2367,8 +2358,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
} }
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
break;
} }
break;
case ANIMTYPE_OBJECT: case ANIMTYPE_OBJECT:
{ {
bDopeSheet *ads = (bDopeSheet *)ac->data; bDopeSheet *ads = (bDopeSheet *)ac->data;
@@ -2406,9 +2397,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
adt->flag |= ADT_UI_ACTIVE; adt->flag |= ADT_UI_ACTIVE;
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
break;
} }
break;
case ANIMTYPE_FILLACTD: /* Action Expander */ case ANIMTYPE_FILLACTD: /* Action Expander */
case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */ case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */
case ANIMTYPE_DSLAM: case ANIMTYPE_DSLAM:
@@ -2445,9 +2435,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
} }
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
break;
} }
break;
case ANIMTYPE_GROUP: case ANIMTYPE_GROUP:
{ {
bActionGroup *agrp = (bActionGroup *)ale->data; bActionGroup *agrp = (bActionGroup *)ale->data;
@@ -2482,8 +2471,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
ANIM_set_active_channel(ac, ac->data, ac->datatype, filter, NULL, ANIMTYPE_GROUP); ANIM_set_active_channel(ac, ac->data, ac->datatype, filter, NULL, ANIMTYPE_GROUP);
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
break;
} }
break;
case ANIMTYPE_FCURVE: case ANIMTYPE_FCURVE:
{ {
FCurve *fcu = (FCurve *)ale->data; FCurve *fcu = (FCurve *)ale->data;
@@ -2504,8 +2493,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
ANIM_set_active_channel(ac, ac->data, ac->datatype, filter, fcu, ANIMTYPE_FCURVE); ANIM_set_active_channel(ac, ac->data, ac->datatype, filter, fcu, ANIMTYPE_FCURVE);
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
break;
} }
break;
case ANIMTYPE_SHAPEKEY: case ANIMTYPE_SHAPEKEY:
{ {
KeyBlock *kb = (KeyBlock *)ale->data; KeyBlock *kb = (KeyBlock *)ale->data;
@@ -2522,8 +2511,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
} }
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
break;
} }
break;
case ANIMTYPE_GPDATABLOCK: case ANIMTYPE_GPDATABLOCK:
{ {
bGPdata *gpd = (bGPdata *)ale->data; bGPdata *gpd = (bGPdata *)ale->data;
@@ -2534,8 +2523,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
gpd->flag ^= GP_DATA_EXPAND; gpd->flag ^= GP_DATA_EXPAND;
notifierFlags |= (ND_ANIMCHAN | NA_EDITED); notifierFlags |= (ND_ANIMCHAN | NA_EDITED);
break;
} }
break;
case ANIMTYPE_GPLAYER: case ANIMTYPE_GPLAYER:
{ {
bGPDlayer *gpl = (bGPDlayer *)ale->data; bGPDlayer *gpl = (bGPDlayer *)ale->data;
@@ -2552,8 +2541,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
} }
notifierFlags |= (ND_ANIMCHAN | NA_EDITED); notifierFlags |= (ND_ANIMCHAN | NA_EDITED);
break;
} }
break;
case ANIMTYPE_MASKDATABLOCK: case ANIMTYPE_MASKDATABLOCK:
{ {
Mask *mask = (Mask *)ale->data; Mask *mask = (Mask *)ale->data;
@@ -2564,8 +2553,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
mask->flag ^= MASK_ANIMF_EXPAND; mask->flag ^= MASK_ANIMF_EXPAND;
notifierFlags |= (ND_ANIMCHAN | NA_EDITED); notifierFlags |= (ND_ANIMCHAN | NA_EDITED);
break;
} }
break;
case ANIMTYPE_MASKLAYER: case ANIMTYPE_MASKLAYER:
{ {
MaskLayer *masklay = (MaskLayer *)ale->data; MaskLayer *masklay = (MaskLayer *)ale->data;
@@ -2582,8 +2571,8 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
} }
notifierFlags |= (ND_ANIMCHAN | NA_EDITED); notifierFlags |= (ND_ANIMCHAN | NA_EDITED);
break;
} }
break;
default: default:
if (G.debug & G_DEBUG) if (G.debug & G_DEBUG)
printf("Error: Invalid channel type in mouse_anim_channels()\n"); printf("Error: Invalid channel type in mouse_anim_channels()\n");

14
source/blender/editors/animation/anim_draw.c
View File

@@ -126,17 +126,15 @@ void ANIM_timecode_string_from_frame(char *str, Scene *scene, int power, short t
if (hours) sprintf(str, "%s%02d:%02d:%02d", neg, hours, minutes, seconds); if (hours) sprintf(str, "%s%02d:%02d:%02d", neg, hours, minutes, seconds);
else sprintf(str, "%s%02d:%02d", neg, minutes, seconds); else sprintf(str, "%s%02d:%02d", neg, minutes, seconds);
} }
break;
} }
break;
case USER_TIMECODE_SMPTE_MSF: case USER_TIMECODE_SMPTE_MSF:
{ {
/* reduced SMPTE format that always shows minutes, seconds, frames. Hours only shown as needed. */ /* reduced SMPTE format that always shows minutes, seconds, frames. Hours only shown as needed. */
if (hours) sprintf(str, "%s%02d:%02d:%02d:%02d", neg, hours, minutes, seconds, frames); if (hours) sprintf(str, "%s%02d:%02d:%02d:%02d", neg, hours, minutes, seconds, frames);
else sprintf(str, "%s%02d:%02d:%02d", neg, minutes, seconds, frames); else sprintf(str, "%s%02d:%02d:%02d", neg, minutes, seconds, frames);
break;
} }
break;
case USER_TIMECODE_MILLISECONDS: case USER_TIMECODE_MILLISECONDS:
{ {
/* reduced SMPTE. Instead of frames, milliseconds are shown */ /* reduced SMPTE. Instead of frames, milliseconds are shown */
@@ -145,25 +143,23 @@ void ANIM_timecode_string_from_frame(char *str, Scene *scene, int power, short t
if (hours) sprintf(str, "%s%02d:%02d:%0*.*f", neg, hours, minutes, s_pad, ms_dp, cfra); if (hours) sprintf(str, "%s%02d:%02d:%0*.*f", neg, hours, minutes, s_pad, ms_dp, cfra);
else sprintf(str, "%s%02d:%0*.*f", neg, minutes, s_pad, ms_dp, cfra); else sprintf(str, "%s%02d:%0*.*f", neg, minutes, s_pad, ms_dp, cfra);
break;
} }
break;
case USER_TIMECODE_SECONDS_ONLY: case USER_TIMECODE_SECONDS_ONLY:
{ {
/* only show the original seconds display */ /* only show the original seconds display */
/* round to whole numbers if power is >= 1 (i.e. scale is coarse) */ /* round to whole numbers if power is >= 1 (i.e. scale is coarse) */
if (power <= 0) sprintf(str, "%.*f", 1 - power, raw_seconds); if (power <= 0) sprintf(str, "%.*f", 1 - power, raw_seconds);
else sprintf(str, "%d", (int)floor(raw_seconds + GLA_PIXEL_OFS)); else sprintf(str, "%d", (int)floor(raw_seconds + GLA_PIXEL_OFS));
break;
} }
break;
case USER_TIMECODE_SMPTE_FULL: case USER_TIMECODE_SMPTE_FULL:
default: default:
{ {
/* full SMPTE format */ /* full SMPTE format */
sprintf(str, "%s%02d:%02d:%02d:%02d", neg, hours, minutes, seconds, frames); sprintf(str, "%s%02d:%02d:%02d:%02d", neg, hours, minutes, seconds, frames);
break;
} }
break;
} }
} }
else { else {

115
source/blender/editors/animation/anim_filter.c
View File

@@ -301,22 +301,20 @@ short ANIM_animdata_context_getdata(bAnimContext *ac)
{ {
SpaceAction *saction = (SpaceAction *)sl; SpaceAction *saction = (SpaceAction *)sl;
ok = actedit_get_context(ac, saction); ok = actedit_get_context(ac, saction);
break;
} }
break;
case SPACE_IPO: case SPACE_IPO:
{ {
SpaceIpo *sipo = (SpaceIpo *)sl; SpaceIpo *sipo = (SpaceIpo *)sl;
ok = graphedit_get_context(ac, sipo); ok = graphedit_get_context(ac, sipo);
break;
} }
break;
case SPACE_NLA: case SPACE_NLA:
{ {
SpaceNla *snla = (SpaceNla *)sl; SpaceNla *snla = (SpaceNla *)sl;
ok = nlaedit_get_context(ac, snla); ok = nlaedit_get_context(ac, snla);
break;
} }
break;
} }
} }
@@ -543,9 +541,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
*/ */
ale->key_data = NULL; ale->key_data = NULL;
ale->datatype = ALE_ALL; ale->datatype = ALE_ALL;
break;
} }
break;
case ANIMTYPE_SCENE: case ANIMTYPE_SCENE:
{ {
Scene *sce = (Scene *)data; Scene *sce = (Scene *)data;
@@ -556,8 +553,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_SCE; ale->datatype = ALE_SCE;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_OBJECT: case ANIMTYPE_OBJECT:
{ {
Base *base = (Base *)data; Base *base = (Base *)data;
@@ -569,8 +566,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_OB; ale->datatype = ALE_OB;
ale->adt = BKE_animdata_from_id(&ob->id); ale->adt = BKE_animdata_from_id(&ob->id);
break;
} }
break;
case ANIMTYPE_FILLACTD: case ANIMTYPE_FILLACTD:
{ {
bAction *act = (bAction *)data; bAction *act = (bAction *)data;
@@ -579,8 +576,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->key_data = act; ale->key_data = act;
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
break;
} }
break;
case ANIMTYPE_FILLDRIVERS: case ANIMTYPE_FILLDRIVERS:
{ {
AnimData *adt = (AnimData *)data; AnimData *adt = (AnimData *)data;
@@ -590,9 +587,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
// XXX... drivers don't show summary for now // XXX... drivers don't show summary for now
ale->key_data = NULL; ale->key_data = NULL;
ale->datatype = ALE_NONE; ale->datatype = ALE_NONE;
break;
} }
break;
case ANIMTYPE_DSMAT: case ANIMTYPE_DSMAT:
{ {
Material *ma = (Material *)data; Material *ma = (Material *)data;
@@ -604,8 +600,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSLAM: case ANIMTYPE_DSLAM:
{ {
Lamp *la = (Lamp *)data; Lamp *la = (Lamp *)data;
@@ -617,8 +613,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSCAM: case ANIMTYPE_DSCAM:
{ {
Camera *ca = (Camera *)data; Camera *ca = (Camera *)data;
@@ -630,8 +626,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSCUR: case ANIMTYPE_DSCUR:
{ {
Curve *cu = (Curve *)data; Curve *cu = (Curve *)data;
@@ -643,8 +639,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSARM: case ANIMTYPE_DSARM:
{ {
bArmature *arm = (bArmature *)data; bArmature *arm = (bArmature *)data;
@@ -656,8 +652,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSMESH: case ANIMTYPE_DSMESH:
{ {
Mesh *me = (Mesh *)data; Mesh *me = (Mesh *)data;
@@ -669,8 +665,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSLAT: case ANIMTYPE_DSLAT:
{ {
Lattice *lt = (Lattice *)data; Lattice *lt = (Lattice *)data;
@@ -682,8 +678,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSSPK: case ANIMTYPE_DSSPK:
{ {
Speaker *spk = (Speaker *)data; Speaker *spk = (Speaker *)data;
@@ -695,8 +691,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSSKEY: case ANIMTYPE_DSSKEY:
{ {
Key *key = (Key *)data; Key *key = (Key *)data;
@@ -708,8 +704,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSWOR: case ANIMTYPE_DSWOR:
{ {
World *wo = (World *)data; World *wo = (World *)data;
@@ -721,8 +717,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSNTREE: case ANIMTYPE_DSNTREE:
{ {
bNodeTree *ntree = (bNodeTree *)data; bNodeTree *ntree = (bNodeTree *)data;
@@ -734,8 +730,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSLINESTYLE: case ANIMTYPE_DSLINESTYLE:
{ {
FreestyleLineStyle *linestyle = (FreestyleLineStyle *)data; FreestyleLineStyle *linestyle = (FreestyleLineStyle *)data;
@@ -747,8 +743,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSPART: case ANIMTYPE_DSPART:
{ {
ParticleSettings *part = (ParticleSettings *)ale->data; ParticleSettings *part = (ParticleSettings *)ale->data;
@@ -760,8 +756,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_DSTEX: case ANIMTYPE_DSTEX:
{ {
Tex *tex = (Tex *)data; Tex *tex = (Tex *)data;
@@ -773,9 +769,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->datatype = ALE_ACT; ale->datatype = ALE_ACT;
ale->adt = BKE_animdata_from_id(data); ale->adt = BKE_animdata_from_id(data);
break;
} }
break;
case ANIMTYPE_GROUP: case ANIMTYPE_GROUP:
{ {
bActionGroup *agrp = (bActionGroup *)data; bActionGroup *agrp = (bActionGroup *)data;
@@ -784,8 +779,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->key_data = NULL; ale->key_data = NULL;
ale->datatype = ALE_GROUP; ale->datatype = ALE_GROUP;
break;
} }
break;
case ANIMTYPE_FCURVE: case ANIMTYPE_FCURVE:
{ {
FCurve *fcu = (FCurve *)data; FCurve *fcu = (FCurve *)data;
@@ -794,9 +789,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->key_data = fcu; ale->key_data = fcu;
ale->datatype = ALE_FCURVE; ale->datatype = ALE_FCURVE;
break;
} }
break;
case ANIMTYPE_SHAPEKEY: case ANIMTYPE_SHAPEKEY:
{ {
KeyBlock *kb = (KeyBlock *)data; KeyBlock *kb = (KeyBlock *)data;
@@ -824,9 +818,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
} }
ale->datatype = (ale->key_data) ? ALE_FCURVE : ALE_NONE; ale->datatype = (ale->key_data) ? ALE_FCURVE : ALE_NONE;
} }
break;
} }
break;
case ANIMTYPE_GPLAYER: case ANIMTYPE_GPLAYER:
{ {
bGPDlayer *gpl = (bGPDlayer *)data; bGPDlayer *gpl = (bGPDlayer *)data;
@@ -835,9 +828,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->key_data = NULL; ale->key_data = NULL;
ale->datatype = ALE_GPFRAME; ale->datatype = ALE_GPFRAME;
break;
} }
break;
case ANIMTYPE_MASKLAYER: case ANIMTYPE_MASKLAYER:
{ {
MaskLayer *masklay = (MaskLayer *)data; MaskLayer *masklay = (MaskLayer *)data;
@@ -846,9 +838,8 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->key_data = NULL; ale->key_data = NULL;
ale->datatype = ALE_MASKLAY; ale->datatype = ALE_MASKLAY;
break;
} }
break;
case ANIMTYPE_NLATRACK: case ANIMTYPE_NLATRACK:
{ {
NlaTrack *nlt = (NlaTrack *)data; NlaTrack *nlt = (NlaTrack *)data;
@@ -857,15 +848,15 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
ale->key_data = &nlt->strips; ale->key_data = &nlt->strips;
ale->datatype = ALE_NLASTRIP; ale->datatype = ALE_NLASTRIP;
break;
} }
break;
case ANIMTYPE_NLAACTION: case ANIMTYPE_NLAACTION:
{ {
/* nothing to include for now... nothing editable from NLA-perspective here */ /* nothing to include for now... nothing editable from NLA-perspective here */
ale->key_data = NULL; ale->key_data = NULL;
ale->datatype = ALE_NONE; ale->datatype = ALE_NONE;
break;
} }
break;
} }
} }
@@ -1654,20 +1645,20 @@ static size_t animdata_filter_ds_textures(bAnimContext *ac, ListBase *anim_data,
{ {
Material *ma = (Material *)owner_id; Material *ma = (Material *)owner_id;
mtex = (MTex **)(&ma->mtex); mtex = (MTex **)(&ma->mtex);
break;
} }
break;
case ID_LA: case ID_LA:
{ {
Lamp *la = (Lamp *)owner_id; Lamp *la = (Lamp *)owner_id;
mtex = (MTex **)(&la->mtex); mtex = (MTex **)(&la->mtex);
break;
} }
break;
case ID_WO: case ID_WO:
{ {
World *wo = (World *)owner_id; World *wo = (World *)owner_id;
mtex = (MTex **)(&wo->mtex); mtex = (MTex **)(&wo->mtex);
break;
} }
break;
default: default:
{ {
/* invalid/unsupported option */ /* invalid/unsupported option */
@@ -1812,8 +1803,8 @@ static void animfilter_modifier_idpoin_cb(void *afm_ptr, Object *ob, ID **idpoin
if (!(afm->ads->filterflag & ADS_FILTER_NOTEX)) { if (!(afm->ads->filterflag & ADS_FILTER_NOTEX)) {
afm->items += animdata_filter_ds_texture(afm->ac, &afm->tmp_data, afm->ads, tex, owner_id, afm->filter_mode); afm->items += animdata_filter_ds_texture(afm->ac, &afm->tmp_data, afm->ads, tex, owner_id, afm->filter_mode);
} }
break;
} }
break;
/* TODO: images? */ /* TODO: images? */
} }
@@ -1920,8 +1911,8 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
type = ANIMTYPE_DSCAM; type = ANIMTYPE_DSCAM;
expanded = FILTER_CAM_OBJD(ca); expanded = FILTER_CAM_OBJD(ca);
break;
} }
break;
case OB_LAMP: /* ---------- Lamp ----------- */ case OB_LAMP: /* ---------- Lamp ----------- */
{ {
Lamp *la = (Lamp *)ob->data; Lamp *la = (Lamp *)ob->data;
@@ -1931,8 +1922,8 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
type = ANIMTYPE_DSLAM; type = ANIMTYPE_DSLAM;
expanded = FILTER_LAM_OBJD(la); expanded = FILTER_LAM_OBJD(la);
break;
} }
break;
case OB_CURVE: /* ------- Curve ---------- */ case OB_CURVE: /* ------- Curve ---------- */
case OB_SURF: /* ------- Nurbs Surface ---------- */ case OB_SURF: /* ------- Nurbs Surface ---------- */
case OB_FONT: /* ------- Text Curve ---------- */ case OB_FONT: /* ------- Text Curve ---------- */
@@ -1944,8 +1935,8 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
type = ANIMTYPE_DSCUR; type = ANIMTYPE_DSCUR;
expanded = FILTER_CUR_OBJD(cu); expanded = FILTER_CUR_OBJD(cu);
break;
} }
break;
case OB_MBALL: /* ------- MetaBall ---------- */ case OB_MBALL: /* ------- MetaBall ---------- */
{ {
MetaBall *mb = (MetaBall *)ob->data; MetaBall *mb = (MetaBall *)ob->data;
@@ -1955,8 +1946,8 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
type = ANIMTYPE_DSMBALL; type = ANIMTYPE_DSMBALL;
expanded = FILTER_MBALL_OBJD(mb); expanded = FILTER_MBALL_OBJD(mb);
break;
} }
break;
case OB_ARMATURE: /* ------- Armature ---------- */ case OB_ARMATURE: /* ------- Armature ---------- */
{ {
bArmature *arm = (bArmature *)ob->data; bArmature *arm = (bArmature *)ob->data;
@@ -1966,8 +1957,8 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
type = ANIMTYPE_DSARM; type = ANIMTYPE_DSARM;
expanded = FILTER_ARM_OBJD(arm); expanded = FILTER_ARM_OBJD(arm);
break;
} }
break;
case OB_MESH: /* ------- Mesh ---------- */ case OB_MESH: /* ------- Mesh ---------- */
{ {
Mesh *me = (Mesh *)ob->data; Mesh *me = (Mesh *)ob->data;
@@ -1977,8 +1968,8 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
type = ANIMTYPE_DSMESH; type = ANIMTYPE_DSMESH;
expanded = FILTER_MESH_OBJD(me); expanded = FILTER_MESH_OBJD(me);
break;
} }
break;
case OB_LATTICE: /* ---- Lattice ---- */ case OB_LATTICE: /* ---- Lattice ---- */
{ {
Lattice *lt = (Lattice *)ob->data; Lattice *lt = (Lattice *)ob->data;
@@ -1988,16 +1979,16 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
type = ANIMTYPE_DSLAT; type = ANIMTYPE_DSLAT;
expanded = FILTER_LATTICE_OBJD(lt); expanded = FILTER_LATTICE_OBJD(lt);
break;
} }
break;
case OB_SPEAKER: /* ---------- Speaker ----------- */ case OB_SPEAKER: /* ---------- Speaker ----------- */
{ {
Speaker *spk = (Speaker *)ob->data; Speaker *spk = (Speaker *)ob->data;
type = ANIMTYPE_DSSPK; type = ANIMTYPE_DSSPK;
expanded = FILTER_SPK_OBJD(spk); expanded = FILTER_SPK_OBJD(spk);
break;
} }
break;
} }
/* add object data animation channels */ /* add object data animation channels */
@@ -2020,8 +2011,8 @@ static size_t animdata_filter_ds_obdata(bAnimContext *ac, ListBase *anim_data, b
/* textures */ /* textures */
if (!(ads->filterflag & ADS_FILTER_NOTEX)) if (!(ads->filterflag & ADS_FILTER_NOTEX))
tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, &la->id, filter_mode); tmp_items += animdata_filter_ds_textures(ac, &tmp_data, ads, &la->id, filter_mode);
break;
} }
break;
} }
} }
END_ANIMFILTER_SUBCHANNELS; END_ANIMFILTER_SUBCHANNELS;
@@ -2603,58 +2594,52 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
/* the check for the DopeSheet summary is included here since the summary works here too */ /* the check for the DopeSheet summary is included here since the summary works here too */
if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items)) if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
items += animfilter_action(ac, anim_data, ads, data, filter_mode, (ID *)obact); items += animfilter_action(ac, anim_data, ads, data, filter_mode, (ID *)obact);
break;
} }
break;
case ANIMCONT_SHAPEKEY: /* 'ShapeKey Editor' */ case ANIMCONT_SHAPEKEY: /* 'ShapeKey Editor' */
{ {
/* the check for the DopeSheet summary is included here since the summary works here too */ /* the check for the DopeSheet summary is included here since the summary works here too */
if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items)) if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
items = animdata_filter_shapekey(ac, anim_data, data, filter_mode); items = animdata_filter_shapekey(ac, anim_data, data, filter_mode);
break;
} }
break;
case ANIMCONT_GPENCIL: case ANIMCONT_GPENCIL:
{ {
if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items)) if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
items = animdata_filter_gpencil(anim_data, data, filter_mode); items = animdata_filter_gpencil(anim_data, data, filter_mode);
break;
} }
break;
case ANIMCONT_MASK: case ANIMCONT_MASK:
{ {
if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items)) if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
items = animdata_filter_mask(anim_data, data, filter_mode); items = animdata_filter_mask(anim_data, data, filter_mode);
break;
} }
break;
case ANIMCONT_DOPESHEET: /* 'DopeSheet Editor' */ case ANIMCONT_DOPESHEET: /* 'DopeSheet Editor' */
{ {
/* the DopeSheet editor is the primary place where the DopeSheet summaries are useful */ /* the DopeSheet editor is the primary place where the DopeSheet summaries are useful */
if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items)) if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
items += animdata_filter_dopesheet(ac, anim_data, data, filter_mode); items += animdata_filter_dopesheet(ac, anim_data, data, filter_mode);
break;
} }
break;
case ANIMCONT_FCURVES: /* Graph Editor -> F-Curves/Animation Editing */ case ANIMCONT_FCURVES: /* Graph Editor -> F-Curves/Animation Editing */
case ANIMCONT_DRIVERS: /* Graph Editor -> Drivers Editing */ case ANIMCONT_DRIVERS: /* Graph Editor -> Drivers Editing */
case ANIMCONT_NLA: /* NLA Editor */ case ANIMCONT_NLA: /* NLA Editor */
{ {
/* all of these editors use the basic DopeSheet data for filtering options, but don't have all the same features */ /* all of these editors use the basic DopeSheet data for filtering options, but don't have all the same features */
items = animdata_filter_dopesheet(ac, anim_data, data, filter_mode); items = animdata_filter_dopesheet(ac, anim_data, data, filter_mode);
break;
} }
break;
case ANIMCONT_CHANNEL: /* animation channel */ case ANIMCONT_CHANNEL: /* animation channel */
{ {
bDopeSheet *ads = ac->ads; bDopeSheet *ads = ac->ads;
/* based on the channel type, filter relevant data for this */ /* based on the channel type, filter relevant data for this */
items = animdata_filter_animchan(ac, anim_data, ads, data, filter_mode); items = animdata_filter_animchan(ac, anim_data, ads, data, filter_mode);
break;
} }
break;
} }
/* remove any 'weedy' entries */ /* remove any 'weedy' entries */
items = animdata_filter_remove_invalid(anim_data); items = animdata_filter_remove_invalid(anim_data);

2
source/blender/editors/animation/drivers.c
View File

@@ -449,8 +449,8 @@ static char *get_driver_path_hack(bContext *C, PointerRNA *ptr, PropertyRNA *pro
/* free old one */ /* free old one */
MEM_freeN(basepath); MEM_freeN(basepath);
} }
break;
} }
break;
} }
/* fix RNA pointer, as we've now changed the ID root by changing the paths */ /* fix RNA pointer, as we've now changed the ID root by changing the paths */

2
source/blender/editors/animation/fmodifier_ui.c
View File

@@ -242,8 +242,8 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
else else
uiDefBut(block, LABEL, 1, ") ", 0, 0, 2 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); uiDefBut(block, LABEL, 1, ") ", 0, 0, 2 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
} }
break;
} }
break;
} }
} }

11
source/blender/editors/animation/keyframes_draw.c
View File

@@ -601,30 +601,27 @@ void draw_keyframe_shape(float x, float y, float xscale, float hsize, short sel,
{ {
if (sel) glColor4f(0.33f, 0.75f, 0.93f, alpha); if (sel) glColor4f(0.33f, 0.75f, 0.93f, alpha);
else glColor4f(0.70f, 0.86f, 0.91f, alpha); else glColor4f(0.70f, 0.86f, 0.91f, alpha);
break;
} }
break;
case BEZT_KEYTYPE_EXTREME: /* redish frames for now */ case BEZT_KEYTYPE_EXTREME: /* redish frames for now */
{ {
if (sel) glColor4f(0.95f, 0.5f, 0.5f, alpha); if (sel) glColor4f(0.95f, 0.5f, 0.5f, alpha);
else glColor4f(0.91f, 0.70f, 0.80f, alpha); else glColor4f(0.91f, 0.70f, 0.80f, alpha);
break;
} }
break;
case BEZT_KEYTYPE_JITTER: /* greenish frames for now? */ case BEZT_KEYTYPE_JITTER: /* greenish frames for now? */
{ {
if (sel) glColor4f(0.38f, 0.75f, 0.26f, alpha); if (sel) glColor4f(0.38f, 0.75f, 0.26f, alpha);
else glColor4f(0.58f, 0.90f, 0.46f, alpha); else glColor4f(0.58f, 0.90f, 0.46f, alpha);
break;
} }
break;
case BEZT_KEYTYPE_KEYFRAME: /* traditional yellowish frames for now */ case BEZT_KEYTYPE_KEYFRAME: /* traditional yellowish frames for now */
default: default:
{ {
if (sel) UI_ThemeColorShadeAlpha(TH_STRIP_SELECT, 50, -255 * (1.0f - alpha)); if (sel) UI_ThemeColorShadeAlpha(TH_STRIP_SELECT, 50, -255 * (1.0f - alpha));
else glColor4f(0.91f, 0.91f, 0.91f, alpha); else glColor4f(0.91f, 0.91f, 0.91f, alpha);
break;
} }
break;
} }
glCallList(displist2); glCallList(displist2);

2
source/blender/editors/animation/keyframing.c
View File

@@ -1973,8 +1973,8 @@ short id_frame_has_keyframe(ID *id, float frame, short filter)
/* only check keyframes in active action */ /* only check keyframes in active action */
if (adt) if (adt)
return action_frame_has_keyframe(adt->action, frame, filter); return action_frame_has_keyframe(adt->action, frame, filter);
break;
} }
break;
} }

2
source/blender/editors/animation/keyingsets.c
View File

@@ -1004,8 +1004,8 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
// XXX: only object transforms? // XXX: only object transforms?
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
break;
} }
break;
} }
/* send notifiers for updates (this doesn't require context to work!) */ /* send notifiers for updates (this doesn't require context to work!) */

15
source/blender/editors/armature/pose_slide.c
View File

@@ -238,9 +238,8 @@ static void pose_slide_apply_val(tPoseSlideOp *pso, FCurve *fcu, float *val)
while (iters-- > 0) { while (iters-- > 0) {
(*val) = (-((sVal * w2) + (eVal * w1)) + ((*val) * 6.0f) ) / 5.0f; (*val) = (-((sVal * w2) + (eVal * w1)) + ((*val) * 6.0f) ) / 5.0f;
} }
break;
} }
break;
case POSESLIDE_RELAX: /* make the current pose more like its surrounding ones */ case POSESLIDE_RELAX: /* make the current pose more like its surrounding ones */
{ {
/* perform a weighted average here, favoring the middle pose /* perform a weighted average here, favoring the middle pose
@@ -252,16 +251,15 @@ static void pose_slide_apply_val(tPoseSlideOp *pso, FCurve *fcu, float *val)
while (iters-- > 0) { while (iters-- > 0) {
(*val) = ( ((sVal * w2) + (eVal * w1)) + ((*val) * 5.0f) ) / 6.0f; (*val) = ( ((sVal * w2) + (eVal * w1)) + ((*val) * 5.0f) ) / 6.0f;
} }
break;
} }
break;
case POSESLIDE_BREAKDOWN: /* make the current pose slide around between the endpoints */ case POSESLIDE_BREAKDOWN: /* make the current pose slide around between the endpoints */
{ {
/* perform simple linear interpolation - coefficient for start must come from pso->percentage... */ /* perform simple linear interpolation - coefficient for start must come from pso->percentage... */
/* TODO: make this use some kind of spline interpolation instead? */ /* TODO: make this use some kind of spline interpolation instead? */
(*val) = ((sVal * w2) + (eVal * w1)); (*val) = ((sVal * w2) + (eVal * w1));
break;
} }
break;
} }
} }
@@ -327,8 +325,8 @@ static void pose_slide_apply_props(tPoseSlideOp *pso, tPChanFCurveLink *pfl)
float tval = RNA_property_float_get(&ptr, prop); float tval = RNA_property_float_get(&ptr, prop);
pose_slide_apply_val(pso, fcu, &tval); pose_slide_apply_val(pso, fcu, &tval);
RNA_property_float_set(&ptr, prop, tval); RNA_property_float_set(&ptr, prop, tval);
break;
} }
break;
case PROP_BOOLEAN: case PROP_BOOLEAN:
case PROP_ENUM: case PROP_ENUM:
case PROP_INT: case PROP_INT:
@@ -336,8 +334,8 @@ static void pose_slide_apply_props(tPoseSlideOp *pso, tPChanFCurveLink *pfl)
float tval = (float)RNA_property_int_get(&ptr, prop); float tval = (float)RNA_property_int_get(&ptr, prop);
pose_slide_apply_val(pso, fcu, &tval); pose_slide_apply_val(pso, fcu, &tval);
RNA_property_int_set(&ptr, prop, (int)tval); RNA_property_int_set(&ptr, prop, (int)tval);
break;
} }
break;
default: default:
/* cannot handle */ /* cannot handle */
//printf("Cannot Pose Slide non-numerical property\n"); //printf("Cannot Pose Slide non-numerical property\n");
@@ -672,9 +670,8 @@ static int pose_slide_modal(bContext *C, wmOperator *op, const wmEvent *event)
/* apply... */ /* apply... */
pose_slide_apply(C, pso); pose_slide_apply(C, pso);
break;
} }
break;
default: /* unhandled event (maybe it was some view manip? */ default: /* unhandled event (maybe it was some view manip? */
/* allow to pass through */ /* allow to pass through */
return OPERATOR_RUNNING_MODAL | OPERATOR_PASS_THROUGH; return OPERATOR_RUNNING_MODAL | OPERATOR_PASS_THROUGH;

4
source/blender/editors/gpencil/drawgpencil.c
View File

@@ -706,8 +706,8 @@ void draw_gpencil_2dimage(const bContext *C)
wmOrtho2(ar->v2d.cur.xmin, ar->v2d.cur.xmax, ar->v2d.cur.ymin, ar->v2d.cur.ymax); wmOrtho2(ar->v2d.cur.xmin, ar->v2d.cur.xmax, ar->v2d.cur.ymin, ar->v2d.cur.ymax);
dflag |= GP_DRAWDATA_ONLYV2D | GP_DRAWDATA_IEDITHACK; dflag |= GP_DRAWDATA_ONLYV2D | GP_DRAWDATA_IEDITHACK;
break;
} }
break;
case SPACE_SEQ: /* sequence */ case SPACE_SEQ: /* sequence */
{ {
/* just draw using standard scaling (settings here are currently ignored anyways) */ /* just draw using standard scaling (settings here are currently ignored anyways) */
@@ -720,8 +720,8 @@ void draw_gpencil_2dimage(const bContext *C)
* and everything moved to standard View2d * and everything moved to standard View2d
*/ */
dflag |= GP_DRAWDATA_ONLYV2D; dflag |= GP_DRAWDATA_ONLYV2D;
break;
} }
break;
default: /* for spacetype not yet handled */ default: /* for spacetype not yet handled */
offsx = 0; offsx = 0;
offsy = 0; offsy = 0;

19
source/blender/editors/gpencil/gpencil_edit.c
View File

@@ -112,9 +112,8 @@ bGPdata **gpencil_data_get_pointers(const bContext *C, PointerRNA *ptr)
if (ptr) RNA_id_pointer_create(&ob->id, ptr); if (ptr) RNA_id_pointer_create(&ob->id, ptr);
return &ob->gpd; return &ob->gpd;
} }
break;
} }
break;
case SPACE_NODE: /* Nodes Editor */ case SPACE_NODE: /* Nodes Editor */
{ {
SpaceNode *snode = (SpaceNode *)CTX_wm_space_data(C); SpaceNode *snode = (SpaceNode *)CTX_wm_space_data(C);
@@ -125,13 +124,10 @@ bGPdata **gpencil_data_get_pointers(const bContext *C, PointerRNA *ptr)
if (ptr) RNA_id_pointer_create(&snode->nodetree->id, ptr); if (ptr) RNA_id_pointer_create(&snode->nodetree->id, ptr);
return &snode->nodetree->gpd; return &snode->nodetree->gpd;
} }
else {
/* even when there is no node-tree, don't allow this to flow to scene */ /* even when there is no node-tree, don't allow this to flow to scene */
return NULL; return NULL;
}
} }
break;
case SPACE_SEQ: /* Sequencer */ case SPACE_SEQ: /* Sequencer */
{ {
SpaceSeq *sseq = (SpaceSeq *)CTX_wm_space_data(C); SpaceSeq *sseq = (SpaceSeq *)CTX_wm_space_data(C);
@@ -141,8 +137,6 @@ bGPdata **gpencil_data_get_pointers(const bContext *C, PointerRNA *ptr)
if (ptr) RNA_pointer_create(screen_id, &RNA_SpaceSequenceEditor, sseq, ptr); if (ptr) RNA_pointer_create(screen_id, &RNA_SpaceSequenceEditor, sseq, ptr);
return &sseq->gpd; return &sseq->gpd;
} }
break;
case SPACE_IMAGE: /* Image/UV Editor */ case SPACE_IMAGE: /* Image/UV Editor */
{ {
SpaceImage *sima = (SpaceImage *)CTX_wm_space_data(C); SpaceImage *sima = (SpaceImage *)CTX_wm_space_data(C);
@@ -152,8 +146,6 @@ bGPdata **gpencil_data_get_pointers(const bContext *C, PointerRNA *ptr)
if (ptr) RNA_pointer_create(screen_id, &RNA_SpaceImageEditor, sima, ptr); if (ptr) RNA_pointer_create(screen_id, &RNA_SpaceImageEditor, sima, ptr);
return &sima->gpd; return &sima->gpd;
} }
break;
case SPACE_CLIP: /* Nodes Editor */ case SPACE_CLIP: /* Nodes Editor */
{ {
SpaceClip *sc = (SpaceClip *)CTX_wm_space_data(C); SpaceClip *sc = (SpaceClip *)CTX_wm_space_data(C);
@@ -178,9 +170,8 @@ bGPdata **gpencil_data_get_pointers(const bContext *C, PointerRNA *ptr)
return &clip->gpd; return &clip->gpd;
} }
} }
break;
} }
break;
default: /* unsupported space */ default: /* unsupported space */
return NULL; return NULL;
} }

30
source/blender/editors/gpencil/gpencil_paint.c
View File

@@ -1084,9 +1084,8 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
printf("Error: 3D-View active region doesn't have any region data, so cannot be drawable\n"); printf("Error: 3D-View active region doesn't have any region data, so cannot be drawable\n");
return 0; return 0;
} }
break;
} }
break;
case SPACE_NODE: case SPACE_NODE:
{ {
/* SpaceNode *snode = curarea->spacedata.first; */ /* SpaceNode *snode = curarea->spacedata.first; */
@@ -1095,8 +1094,8 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
p->sa = curarea; p->sa = curarea;
p->ar = ar; p->ar = ar;
p->v2d = &ar->v2d; p->v2d = &ar->v2d;
break;
} }
break;
case SPACE_SEQ: case SPACE_SEQ:
{ {
SpaceSeq *sseq = curarea->spacedata.first; SpaceSeq *sseq = curarea->spacedata.first;
@@ -1113,8 +1112,8 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
printf("Error: In active view (sequencer), active mode doesn't support Grease Pencil\n"); printf("Error: In active view (sequencer), active mode doesn't support Grease Pencil\n");
return 0; return 0;
} }
break;
} }
break;
case SPACE_IMAGE: case SPACE_IMAGE:
{ {
/* SpaceImage *sima = curarea->spacedata.first; */ /* SpaceImage *sima = curarea->spacedata.first; */
@@ -1123,8 +1122,8 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
p->sa = curarea; p->sa = curarea;
p->ar = ar; p->ar = ar;
p->v2d = &ar->v2d; p->v2d = &ar->v2d;
break;
} }
break;
case SPACE_CLIP: case SPACE_CLIP:
{ {
SpaceClip *sc = curarea->spacedata.first; SpaceClip *sc = curarea->spacedata.first;
@@ -1151,9 +1150,8 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
p->imat[3][0] -= marker->pos[0]; p->imat[3][0] -= marker->pos[0];
p->imat[3][1] -= marker->pos[1]; p->imat[3][1] -= marker->pos[1];
} }
break;
} }
break;
/* unsupported views */ /* unsupported views */
default: default:
{ {
@@ -1162,7 +1160,6 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
printf("Error: Active view not appropriate for Grease Pencil drawing\n"); printf("Error: Active view not appropriate for Grease Pencil drawing\n");
return 0; return 0;
} }
break;
} }
/* get gp-data */ /* get gp-data */
@@ -1295,21 +1292,18 @@ static void gp_paint_initstroke(tGPsdata *p, short paintmode)
case SPACE_VIEW3D: case SPACE_VIEW3D:
{ {
p->gpd->sbuffer_sflag |= GP_STROKE_3DSPACE; p->gpd->sbuffer_sflag |= GP_STROKE_3DSPACE;
break;
} }
break;
case SPACE_NODE: case SPACE_NODE:
{ {
p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE; p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
break;
} }
break;
case SPACE_SEQ: case SPACE_SEQ:
{ {
p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE; p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
break;
} }
break;
case SPACE_IMAGE: case SPACE_IMAGE:
{ {
SpaceImage *sima = (SpaceImage *)p->sa->spacedata.first; SpaceImage *sima = (SpaceImage *)p->sa->spacedata.first;
@@ -1324,16 +1318,16 @@ static void gp_paint_initstroke(tGPsdata *p, short paintmode)
p->gpd->sbuffer_sflag &= ~GP_STROKE_2DSPACE; p->gpd->sbuffer_sflag &= ~GP_STROKE_2DSPACE;
p->gpd->flag &= ~GP_DATA_VIEWALIGN; p->gpd->flag &= ~GP_DATA_VIEWALIGN;
} }
else else {
p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE; p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
}
break;
} }
break;
case SPACE_CLIP: case SPACE_CLIP:
{ {
p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE; p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
break;
} }
break;
} }
} }
} }

19
source/blender/editors/interface/view2d.c
View File

@@ -209,9 +209,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
} }
/* scrollers - should we have these by default? */ /* scrollers - should we have these by default? */
/* XXX for now, we don't override this, or set it either! */ /* XXX for now, we don't override this, or set it either! */
break;
} }
break;
/* 'list/channel view' - zoom, aspect ratio, and alignment restrictions are set here */ /* 'list/channel view' - zoom, aspect ratio, and alignment restrictions are set here */
case V2D_COMMONVIEW_LIST: case V2D_COMMONVIEW_LIST:
{ {
@@ -225,9 +224,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
tot_changed = do_init; tot_changed = do_init;
/* scroller settings are currently not set here... that is left for regions... */ /* scroller settings are currently not set here... that is left for regions... */
break;
} }
break;
/* 'stack view' - practically the same as list/channel view, except is located in the pos y half instead. /* 'stack view' - practically the same as list/channel view, except is located in the pos y half instead.
* zoom, aspect ratio, and alignment restrictions are set here */ * zoom, aspect ratio, and alignment restrictions are set here */
case V2D_COMMONVIEW_STACK: case V2D_COMMONVIEW_STACK:
@@ -242,9 +240,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
tot_changed = do_init; tot_changed = do_init;
/* scroller settings are currently not set here... that is left for regions... */ /* scroller settings are currently not set here... that is left for regions... */
break;
} }
break;
/* 'header' regions - zoom, aspect ratio, alignment, and panning restrictions are set here */ /* 'header' regions - zoom, aspect ratio, alignment, and panning restrictions are set here */
case V2D_COMMONVIEW_HEADER: case V2D_COMMONVIEW_HEADER:
{ {
@@ -272,10 +269,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
/* absolutely no scrollers allowed */ /* absolutely no scrollers allowed */
v2d->scroll = 0; v2d->scroll = 0;
break;
} }
break;
/* panels view, with horizontal/vertical align */ /* panels view, with horizontal/vertical align */
case V2D_COMMONVIEW_PANELS_UI: case V2D_COMMONVIEW_PANELS_UI:
{ {
@@ -308,9 +303,8 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
v2d->cur.ymax = 0.0f; v2d->cur.ymax = 0.0f;
v2d->cur.ymin = (-winy) * panelzoom; v2d->cur.ymin = (-winy) * panelzoom;
} }
break;
} }
break;
/* other view types are completely defined using their own settings already */ /* other view types are completely defined using their own settings already */
default: default:
/* we don't do anything here, as settings should be fine, but just make sure that rect */ /* we don't do anything here, as settings should be fine, but just make sure that rect */
@@ -1739,9 +1733,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
fac2 = fac2 - time; fac2 = fac2 - time;
scroll_printstr(scene, fac, h, time + (float)FPS * fac2 / 100.0f, grid->powerx, V2D_UNIT_SECONDSSEQ, 'h'); scroll_printstr(scene, fac, h, time + (float)FPS * fac2 / 100.0f, grid->powerx, V2D_UNIT_SECONDSSEQ, 'h');
break;
} }
break;
case V2D_UNIT_DEGREES: /* Graph Editor for rotation Drivers */ case V2D_UNIT_DEGREES: /* Graph Editor for rotation Drivers */
/* HACK: although we're drawing horizontal, we make this draw as 'vertical', just to get degree signs */ /* HACK: although we're drawing horizontal, we make this draw as 'vertical', just to get degree signs */
scroll_printstr(scene, fac, h, val, grid->powerx, V2D_UNIT_DEGREES, 'v'); scroll_printstr(scene, fac, h, val, grid->powerx, V2D_UNIT_DEGREES, 'v');

5
source/blender/editors/interface/view2d_ops.c
View File

@@ -247,8 +247,8 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event)
vpd->lasty = event->y; vpd->lasty = event->y;
view_pan_apply(op); view_pan_apply(op);
break;
} }
break;
/* XXX - Mode switching isn't implemented. See comments in 36818. /* XXX - Mode switching isn't implemented. See comments in 36818.
* switch to zoom */ * switch to zoom */
#if 0 #if 0
@@ -1674,9 +1674,8 @@ static int scroller_activate_modal(bContext *C, wmOperator *op, const wmEvent *e
vsm->lasty = event->y; vsm->lasty = event->y;
scroller_activate_apply(C, op); scroller_activate_apply(C, op);
break;
} }
break;
case LEFTMOUSE: case LEFTMOUSE:
case MIDDLEMOUSE: case MIDDLEMOUSE:
if (event->val == KM_RELEASE) { if (event->val == KM_RELEASE) {

7
source/blender/editors/object/object_lattice.c
View File

@@ -670,8 +670,8 @@ static int lattice_flip_exec(bContext *C, wmOperator *op)
} }
} }
} }
break;
} }
break;
case LATTICE_FLIP_V: case LATTICE_FLIP_V:
{ {
int u, v, w; int u, v, w;
@@ -691,8 +691,8 @@ static int lattice_flip_exec(bContext *C, wmOperator *op)
} }
} }
} }
break;
} }
break;
case LATTICE_FLIP_W: case LATTICE_FLIP_W:
{ {
int u, v, w; int u, v, w;
@@ -711,9 +711,8 @@ static int lattice_flip_exec(bContext *C, wmOperator *op)
} }
} }
} }
break;
} }
break;
default: /* shouldn't happen, but just in case */ default: /* shouldn't happen, but just in case */
break; break;
} }

8
source/blender/editors/object/object_relations.c
View File

@@ -494,23 +494,21 @@ void ED_object_parent_clear(Object *ob, int type)
/* clear parenting relationship completely */ /* clear parenting relationship completely */
ob->parent = NULL; ob->parent = NULL;
break;
} }
break;
case CLEAR_PARENT_KEEP_TRANSFORM: case CLEAR_PARENT_KEEP_TRANSFORM:
{ {
/* remove parent, and apply the parented transform result as object's local transforms */ /* remove parent, and apply the parented transform result as object's local transforms */
ob->parent = NULL; ob->parent = NULL;
BKE_object_apply_mat4(ob, ob->obmat, TRUE, FALSE); BKE_object_apply_mat4(ob, ob->obmat, TRUE, FALSE);
break;
} }
break;
case CLEAR_PARENT_INVERSE: case CLEAR_PARENT_INVERSE:
{ {
/* object stays parented, but the parent inverse (i.e. offset from parent to retain binding state) is cleared */ /* object stays parented, but the parent inverse (i.e. offset from parent to retain binding state) is cleared */
unit_m4(ob->parentinv); unit_m4(ob->parentinv);
break;
} }
break;
} }
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);

90
source/blender/editors/render/render_shading.c
View File

@@ -1066,21 +1066,21 @@ static int freestyle_modifier_remove_exec(bContext *C, wmOperator *op)
} }
switch (freestyle_get_modifier_type(&ptr)) { switch (freestyle_get_modifier_type(&ptr)) {
case LS_MODIFIER_TYPE_COLOR: case LS_MODIFIER_TYPE_COLOR:
BKE_remove_linestyle_color_modifier(lineset->linestyle, modifier); BKE_remove_linestyle_color_modifier(lineset->linestyle, modifier);
break; break;
case LS_MODIFIER_TYPE_ALPHA: case LS_MODIFIER_TYPE_ALPHA:
BKE_remove_linestyle_alpha_modifier(lineset->linestyle, modifier); BKE_remove_linestyle_alpha_modifier(lineset->linestyle, modifier);
break; break;
case LS_MODIFIER_TYPE_THICKNESS: case LS_MODIFIER_TYPE_THICKNESS:
BKE_remove_linestyle_thickness_modifier(lineset->linestyle, modifier); BKE_remove_linestyle_thickness_modifier(lineset->linestyle, modifier);
break; break;
case LS_MODIFIER_TYPE_GEOMETRY: case LS_MODIFIER_TYPE_GEOMETRY:
BKE_remove_linestyle_geometry_modifier(lineset->linestyle, modifier); BKE_remove_linestyle_geometry_modifier(lineset->linestyle, modifier);
break; break;
default: default:
BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier"); BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier");
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
@@ -1116,21 +1116,21 @@ static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op)
} }
switch (freestyle_get_modifier_type(&ptr)) { switch (freestyle_get_modifier_type(&ptr)) {
case LS_MODIFIER_TYPE_COLOR: case LS_MODIFIER_TYPE_COLOR:
BKE_copy_linestyle_color_modifier(lineset->linestyle, modifier); BKE_copy_linestyle_color_modifier(lineset->linestyle, modifier);
break; break;
case LS_MODIFIER_TYPE_ALPHA: case LS_MODIFIER_TYPE_ALPHA:
BKE_copy_linestyle_alpha_modifier(lineset->linestyle, modifier); BKE_copy_linestyle_alpha_modifier(lineset->linestyle, modifier);
break; break;
case LS_MODIFIER_TYPE_THICKNESS: case LS_MODIFIER_TYPE_THICKNESS:
BKE_copy_linestyle_thickness_modifier(lineset->linestyle, modifier); BKE_copy_linestyle_thickness_modifier(lineset->linestyle, modifier);
break; break;
case LS_MODIFIER_TYPE_GEOMETRY: case LS_MODIFIER_TYPE_GEOMETRY:
BKE_copy_linestyle_geometry_modifier(lineset->linestyle, modifier); BKE_copy_linestyle_geometry_modifier(lineset->linestyle, modifier);
break; break;
default: default:
BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier"); BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier");
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
@@ -1167,21 +1167,21 @@ static int freestyle_modifier_move_exec(bContext *C, wmOperator *op)
} }
switch (freestyle_get_modifier_type(&ptr)) { switch (freestyle_get_modifier_type(&ptr)) {
case LS_MODIFIER_TYPE_COLOR: case LS_MODIFIER_TYPE_COLOR:
BKE_move_linestyle_color_modifier(lineset->linestyle, modifier, dir); BKE_move_linestyle_color_modifier(lineset->linestyle, modifier, dir);
break; break;
case LS_MODIFIER_TYPE_ALPHA: case LS_MODIFIER_TYPE_ALPHA:
BKE_move_linestyle_alpha_modifier(lineset->linestyle, modifier, dir); BKE_move_linestyle_alpha_modifier(lineset->linestyle, modifier, dir);
break; break;
case LS_MODIFIER_TYPE_THICKNESS: case LS_MODIFIER_TYPE_THICKNESS:
BKE_move_linestyle_thickness_modifier(lineset->linestyle, modifier, dir); BKE_move_linestyle_thickness_modifier(lineset->linestyle, modifier, dir);
break; break;
case LS_MODIFIER_TYPE_GEOMETRY: case LS_MODIFIER_TYPE_GEOMETRY:
BKE_move_linestyle_geometry_modifier(lineset->linestyle, modifier, dir); BKE_move_linestyle_geometry_modifier(lineset->linestyle, modifier, dir);
break; break;
default: default:
BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier"); BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier");
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);

2
source/blender/editors/screen/screen_ops.c
View File

@@ -2463,8 +2463,8 @@ static int area_join_modal(bContext *C, wmOperator *op, const wmEvent *event)
WM_event_add_notifier(C, NC_WINDOW, NULL); WM_event_add_notifier(C, NC_WINDOW, NULL);
} }
} }
break;
} }
break;
case LEFTMOUSE: case LEFTMOUSE:
if (event->val == KM_RELEASE) { if (event->val == KM_RELEASE) {
ED_area_tag_redraw(jd->sa1); ED_area_tag_redraw(jd->sa1);

14
source/blender/editors/space_action/action_draw.c
View File

@@ -226,39 +226,35 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
{ {
/* reddish color from NLA */ /* reddish color from NLA */
UI_ThemeColor4(TH_ANIM_ACTIVE); UI_ThemeColor4(TH_ANIM_ACTIVE);
break;
} }
break;
case ANIMTYPE_SCENE: case ANIMTYPE_SCENE:
case ANIMTYPE_OBJECT: case ANIMTYPE_OBJECT:
{ {
if (sel) glColor4ub(col1b[0], col1b[1], col1b[2], 0x45); if (sel) glColor4ub(col1b[0], col1b[1], col1b[2], 0x45);
else glColor4ub(col1b[0], col1b[1], col1b[2], 0x22); else glColor4ub(col1b[0], col1b[1], col1b[2], 0x22);
break;
} }
break;
case ANIMTYPE_FILLACTD: case ANIMTYPE_FILLACTD:
case ANIMTYPE_DSSKEY: case ANIMTYPE_DSSKEY:
case ANIMTYPE_DSWOR: case ANIMTYPE_DSWOR:
{ {
if (sel) glColor4ub(col2b[0], col2b[1], col2b[2], 0x45); if (sel) glColor4ub(col2b[0], col2b[1], col2b[2], 0x45);
else glColor4ub(col2b[0], col2b[1], col2b[2], 0x22); else glColor4ub(col2b[0], col2b[1], col2b[2], 0x22);
break;
} }
break;
case ANIMTYPE_GROUP: case ANIMTYPE_GROUP:
{ {
if (sel) glColor4ub(col1a[0], col1a[1], col1a[2], 0x22); if (sel) glColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
else glColor4ub(col2a[0], col2a[1], col2a[2], 0x22); else glColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
break;
} }
break;
default: default:
{ {
if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22); if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
else glColor4ub(col2[0], col2[1], col2[2], 0x22); else glColor4ub(col2[0], col2[1], col2[2], 0x22);
break;
} }
break;
} }
/* draw region twice: firstly backdrop, then the current range */ /* draw region twice: firstly backdrop, then the current range */

8
source/blender/editors/space_action/action_select.c
View File

@@ -1079,26 +1079,26 @@ static void mouse_action_keys(bAnimContext *ac, const int mval[2], short select_
{ {
Scene *scene = (Scene *)ale->key_data; Scene *scene = (Scene *)ale->key_data;
scene_to_keylist(ads, scene, &anim_keys, NULL); scene_to_keylist(ads, scene, &anim_keys, NULL);
break;
} }
break;
case ALE_OB: case ALE_OB:
{ {
Object *ob = (Object *)ale->key_data; Object *ob = (Object *)ale->key_data;
ob_to_keylist(ads, ob, &anim_keys, NULL); ob_to_keylist(ads, ob, &anim_keys, NULL);
break;
} }
break;
case ALE_ACT: case ALE_ACT:
{ {
bAction *act = (bAction *)ale->key_data; bAction *act = (bAction *)ale->key_data;
action_to_keylist(adt, act, &anim_keys, NULL); action_to_keylist(adt, act, &anim_keys, NULL);
break;
} }
break;
case ALE_FCURVE: case ALE_FCURVE:
{ {
FCurve *fcu = (FCurve *)ale->key_data; FCurve *fcu = (FCurve *)ale->key_data;
fcurve_to_keylist(adt, fcu, &anim_keys, NULL); fcurve_to_keylist(adt, fcu, &anim_keys, NULL);
break;
} }
break;
} }
} }
else if (ale->type == ANIMTYPE_SUMMARY) { else if (ale->type == ANIMTYPE_SUMMARY) {

2
source/blender/editors/space_clip/space_clip.c
View File

@@ -1353,8 +1353,8 @@ static void clip_header_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa),
// if (sc->mode == SC_MODE_MASKEDIT) // if (sc->mode == SC_MODE_MASKEDIT)
{ {
ED_region_tag_redraw(ar); ED_region_tag_redraw(ar);
break;
} }
break;
} }
break; break;
} }

2
source/blender/editors/space_graph/graph_buttons.c
View File

@@ -383,8 +383,8 @@ static void do_graph_region_driver_buttons(bContext *C, void *UNUSED(arg), int e
{ {
/* rebuild depsgraph for the new deps */ /* rebuild depsgraph for the new deps */
DAG_relations_tag_update(bmain); DAG_relations_tag_update(bmain);
break;
} }
break;
} }
/* default for now */ /* default for now */

14
source/blender/editors/space_graph/space_graph.c
View File

@@ -518,15 +518,13 @@ static void graph_refresh(const bContext *C, ScrArea *sa)
switch (sipo->mode) { switch (sipo->mode) {
case SIPO_MODE_ANIMATION: /* all animation */ case SIPO_MODE_ANIMATION: /* all animation */
{ {
break;
} }
break;
case SIPO_MODE_DRIVERS: /* drivers only */ case SIPO_MODE_DRIVERS: /* drivers only */
{ {
break;
} }
break;
} }
/* region updates? */ /* region updates? */
@@ -563,11 +561,12 @@ static void graph_refresh(const bContext *C, ScrArea *sa)
/* set color of curve here */ /* set color of curve here */
switch (fcu->color_mode) { switch (fcu->color_mode) {
case FCURVE_COLOR_CUSTOM: case FCURVE_COLOR_CUSTOM:
{
/* User has defined a custom color for this curve already (we assume it's not going to cause clashes with text colors), /* User has defined a custom color for this curve already (we assume it's not going to cause clashes with text colors),
* which should be left alone... Nothing needs to be done here. * which should be left alone... Nothing needs to be done here.
*/ */
break; break;
}
case FCURVE_COLOR_AUTO_RGB: case FCURVE_COLOR_AUTO_RGB:
{ {
/* F-Curve's array index is automatically mapped to RGB values. This works best of 3-value vectors. /* F-Curve's array index is automatically mapped to RGB values. This works best of 3-value vectors.
@@ -590,9 +589,8 @@ static void graph_refresh(const bContext *C, ScrArea *sa)
col[0] = 0.3f; col[1] = 0.8f; col[2] = 1.0f; col[0] = 0.3f; col[1] = 0.8f; col[2] = 1.0f;
break; break;
} }
break;
} }
break;
case FCURVE_COLOR_AUTO_RAINBOW: case FCURVE_COLOR_AUTO_RAINBOW:
default: default:
{ {
@@ -600,8 +598,8 @@ static void graph_refresh(const bContext *C, ScrArea *sa)
* of current item index + total items to determine some RGB color * of current item index + total items to determine some RGB color
*/ */
getcolor_fcurve_rainbow(i, items, fcu->color); getcolor_fcurve_rainbow(i, items, fcu->color);
break;
} }
break;
} }
} }

5
source/blender/editors/space_nla/nla_buttons.c
View File

@@ -125,9 +125,8 @@ static int nla_panel_context(const bContext *C, PointerRNA *adt_ptr, PointerRNA
} }
found = 1; found = 1;
break;
} }
break;
case ANIMTYPE_SCENE: /* Top-Level Widgets doubling up as datablocks */ case ANIMTYPE_SCENE: /* Top-Level Widgets doubling up as datablocks */
case ANIMTYPE_OBJECT: case ANIMTYPE_OBJECT:
case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */ case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */
@@ -167,8 +166,8 @@ static int nla_panel_context(const bContext *C, PointerRNA *adt_ptr, PointerRNA
*/ */
found = -1; found = -1;
} }
break;
} }
break;
} }
if (found > 0) if (found > 0)

13
source/blender/editors/space_nla/nla_channels.c
View File

@@ -119,8 +119,8 @@ static int mouse_nla_channels(bAnimContext *ac, float x, int channel_index, shor
} }
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
break;
} }
break;
case ANIMTYPE_OBJECT: case ANIMTYPE_OBJECT:
{ {
bDopeSheet *ads = (bDopeSheet *)ac->data; bDopeSheet *ads = (bDopeSheet *)ac->data;
@@ -161,9 +161,8 @@ static int mouse_nla_channels(bAnimContext *ac, float x, int channel_index, shor
/* notifiers - channel was selected */ /* notifiers - channel was selected */
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
} }
break;
} }
break;
case ANIMTYPE_FILLACTD: /* Action Expander */ case ANIMTYPE_FILLACTD: /* Action Expander */
case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */ case ANIMTYPE_DSMAT: /* Datablock AnimData Expanders */
case ANIMTYPE_DSLAM: case ANIMTYPE_DSLAM:
@@ -200,9 +199,8 @@ static int mouse_nla_channels(bAnimContext *ac, float x, int channel_index, shor
} }
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
break;
} }
break;
case ANIMTYPE_NLATRACK: case ANIMTYPE_NLATRACK:
{ {
NlaTrack *nlt = (NlaTrack *)ale->data; NlaTrack *nlt = (NlaTrack *)ale->data;
@@ -260,8 +258,8 @@ static int mouse_nla_channels(bAnimContext *ac, float x, int channel_index, shor
/* notifier flags - channel was selected */ /* notifier flags - channel was selected */
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
} }
break;
} }
break;
case ANIMTYPE_NLAACTION: case ANIMTYPE_NLAACTION:
{ {
AnimData *adt = BKE_animdata_from_id(ale->id); AnimData *adt = BKE_animdata_from_id(ale->id);
@@ -316,9 +314,8 @@ static int mouse_nla_channels(bAnimContext *ac, float x, int channel_index, shor
notifierFlags |= (ND_ANIMCHAN | NA_SELECTED); notifierFlags |= (ND_ANIMCHAN | NA_SELECTED);
} }
} }
break;
} }
break;
default: default:
if (G.debug & G_DEBUG) if (G.debug & G_DEBUG)
printf("Error: Invalid channel type in mouse_nla_channels()\n"); printf("Error: Invalid channel type in mouse_nla_channels()\n");

16
source/blender/editors/space_nla/nla_draw.c
View File

@@ -563,9 +563,8 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
nla_draw_strip_frames_text(nlt, strip, v2d, yminc, ymaxc); nla_draw_strip_frames_text(nlt, strip, v2d, yminc, ymaxc);
} }
} }
break;
} }
break;
case ANIMTYPE_NLAACTION: case ANIMTYPE_NLAACTION:
{ {
AnimData *adt = ale->adt; AnimData *adt = ale->adt;
@@ -603,8 +602,8 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *ar)
fdrawline(v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP); fdrawline(v2d->cur.xmin, ymaxc - NLACHANNEL_SKIP, v2d->cur.xmax, ymaxc - NLACHANNEL_SKIP);
glDisable(GL_BLEND); glDisable(GL_BLEND);
break;
} }
break;
} }
} }
@@ -684,8 +683,8 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
/* draw manually still */ /* draw manually still */
do_draw = TRUE; do_draw = TRUE;
break;
} }
break;
case ANIMTYPE_NLAACTION: /* NLA Action-Line */ case ANIMTYPE_NLAACTION: /* NLA Action-Line */
{ {
bAction *act = (bAction *)ale->data; bAction *act = (bAction *)ale->data;
@@ -698,9 +697,8 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
/* draw manually still */ /* draw manually still */
do_draw = TRUE; do_draw = TRUE;
break;
} }
break;
default: /* handled by standard channel-drawing API */ default: /* handled by standard channel-drawing API */
// draw backdrops only... // draw backdrops only...
ANIM_channel_draw(ac, ale, yminc, ymaxc); ANIM_channel_draw(ac, ale, yminc, ymaxc);
@@ -725,17 +723,15 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
/* same as for textures */ /* same as for textures */
offset = 0.7f * U.widget_unit; offset = 0.7f * U.widget_unit;
indent = 1; indent = 1;
break;
} }
break;
case NTREE_TEXTURE: case NTREE_TEXTURE:
{ {
/* even more */ /* even more */
offset = U.widget_unit; offset = U.widget_unit;
indent = 1; indent = 1;
break;
} }
break;
default: default:
/* normal will do */ /* normal will do */
offset = 0.7f * U.widget_unit; offset = 0.7f * U.widget_unit;

24
source/blender/editors/space_node/node_draw.c
View File

@@ -91,18 +91,18 @@ static bNodeTree *node_tree_from_ID(ID *id)
short idtype = GS(id->name); short idtype = GS(id->name);
switch (idtype) { switch (idtype) {
case ID_NT: case ID_NT:
return (bNodeTree *)id; return (bNodeTree *)id;
case ID_MA: case ID_MA:
return ((Material *)id)->nodetree; return ((Material *)id)->nodetree;
case ID_LA: case ID_LA:
return ((Lamp *)id)->nodetree; return ((Lamp *)id)->nodetree;
case ID_WO: case ID_WO:
return ((World *)id)->nodetree; return ((World *)id)->nodetree;
case ID_SCE: case ID_SCE:
return ((Scene *)id)->nodetree; return ((Scene *)id)->nodetree;
case ID_TE: case ID_TE:
return ((Tex *)id)->nodetree; return ((Tex *)id)->nodetree;
} }
} }

34
source/blender/editors/space_node/node_templates.c
View File

@@ -675,23 +675,23 @@ static void ui_node_draw_input(uiLayout *layout, bContext *C, bNodeTree *ntree,
/* input not linked, show value */ /* input not linked, show value */
if (!(input->flag & SOCK_HIDE_VALUE)) { if (!(input->flag & SOCK_HIDE_VALUE)) {
switch (input->type) { switch (input->type) {
case SOCK_FLOAT: case SOCK_FLOAT:
case SOCK_INT: case SOCK_INT:
case SOCK_BOOLEAN: case SOCK_BOOLEAN:
case SOCK_RGBA: case SOCK_RGBA:
case SOCK_STRING: case SOCK_STRING:
row = uiLayoutRow(split, TRUE); row = uiLayoutRow(split, TRUE);
uiItemR(row, &inputptr, "default_value", 0, "", ICON_NONE); uiItemR(row, &inputptr, "default_value", 0, "", ICON_NONE);
break; break;
case SOCK_VECTOR: case SOCK_VECTOR:
row = uiLayoutRow(split, FALSE); row = uiLayoutRow(split, FALSE);
col = uiLayoutColumn(row, FALSE); col = uiLayoutColumn(row, FALSE);
uiItemR(col, &inputptr, "default_value", 0, "", ICON_NONE); uiItemR(col, &inputptr, "default_value", 0, "", ICON_NONE);
break; break;
default: default:
row = uiLayoutRow(split, FALSE); row = uiLayoutRow(split, FALSE);
break; break;
} }
} }
else else

8
source/blender/editors/space_outliner/outliner_draw.c
View File

@@ -464,8 +464,8 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
ED_armature_bone_rename(obedit->data, oldname, newname); ED_armature_bone_rename(obedit->data, oldname, newname);
WM_event_add_notifier(C, NC_OBJECT | ND_POSE, OBACT); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, OBACT);
} }
break;
} }
break;
case TSE_BONE: case TSE_BONE:
{ {
@@ -482,8 +482,8 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
BLI_strncpy(bone->name, oldname, sizeof(bone->name)); BLI_strncpy(bone->name, oldname, sizeof(bone->name));
ED_armature_bone_rename(ob->data, oldname, newname); ED_armature_bone_rename(ob->data, oldname, newname);
WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
break;
} }
break;
case TSE_POSE_CHANNEL: case TSE_POSE_CHANNEL:
{ {
bPoseChannel *pchan = te->directdata; bPoseChannel *pchan = te->directdata;
@@ -499,8 +499,8 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
BLI_strncpy(pchan->name, oldname, sizeof(pchan->name)); BLI_strncpy(pchan->name, oldname, sizeof(pchan->name));
ED_armature_bone_rename(ob->data, oldname, newname); ED_armature_bone_rename(ob->data, oldname, newname);
WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
break;
} }
break;
case TSE_POSEGRP: case TSE_POSEGRP:
{ {
Object *ob = (Object *)tselem->id; // id = object Object *ob = (Object *)tselem->id; // id = object
@@ -509,8 +509,8 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
BLI_uniquename(&ob->pose->agroups, grp, CTX_DATA_(BLF_I18NCONTEXT_ID_ACTION, "Group"), '.', BLI_uniquename(&ob->pose->agroups, grp, CTX_DATA_(BLF_I18NCONTEXT_ID_ACTION, "Group"), '.',
offsetof(bActionGroup, name), sizeof(grp->name)); offsetof(bActionGroup, name), sizeof(grp->name));
WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
break;
} }
break;
case TSE_R_LAYER: case TSE_R_LAYER:
break; break;
} }

4
source/blender/editors/space_outliner/outliner_edit.c
View File

@@ -1181,14 +1181,14 @@ static void do_outliner_drivers_editop(SpaceOops *soops, ListBase *tree, ReportL
{ {
/* add a new driver with the information obtained (only if valid) */ /* add a new driver with the information obtained (only if valid) */
ANIM_add_driver(reports, id, path, array_index, dflags, DRIVER_TYPE_PYTHON); ANIM_add_driver(reports, id, path, array_index, dflags, DRIVER_TYPE_PYTHON);
break;
} }
break;
case DRIVERS_EDITMODE_REMOVE: case DRIVERS_EDITMODE_REMOVE:
{ {
/* remove driver matching the information obtained (only if valid) */ /* remove driver matching the information obtained (only if valid) */
ANIM_remove_driver(reports, id, path, array_index, dflags); ANIM_remove_driver(reports, id, path, array_index, dflags);
break;
} }
break;
} }
} }

17
source/blender/editors/space_outliner/outliner_tools.c
View File

@@ -854,17 +854,15 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
BKE_report(op->reports, RPT_WARNING, "Not yet implemented"); BKE_report(op->reports, RPT_WARNING, "Not yet implemented");
break; break;
} }
break;
} }
break;
case OUTLINER_IDOP_LOCAL: case OUTLINER_IDOP_LOCAL:
{ {
/* make local */ /* make local */
outliner_do_libdata_operation(C, scene, soops, &soops->tree, id_local_cb); outliner_do_libdata_operation(C, scene, soops, &soops->tree, id_local_cb);
ED_undo_push(C, "Localized Data"); ED_undo_push(C, "Localized Data");
break;
} }
break;
case OUTLINER_IDOP_SINGLE: case OUTLINER_IDOP_SINGLE:
{ {
/* make single user */ /* make single user */
@@ -887,9 +885,8 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
BKE_report(op->reports, RPT_WARNING, "Not yet implemented"); BKE_report(op->reports, RPT_WARNING, "Not yet implemented");
break; break;
} }
break;
} }
break;
case OUTLINER_IDOP_FAKE_ADD: case OUTLINER_IDOP_FAKE_ADD:
{ {
/* set fake user */ /* set fake user */
@@ -897,9 +894,8 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL); WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL);
ED_undo_push(C, "Add Fake User"); ED_undo_push(C, "Add Fake User");
break;
} }
break;
case OUTLINER_IDOP_FAKE_CLEAR: case OUTLINER_IDOP_FAKE_CLEAR:
{ {
/* clear fake user */ /* clear fake user */
@@ -907,8 +903,8 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL); WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL);
ED_undo_push(C, "Clear Fake User"); ED_undo_push(C, "Clear Fake User");
break;
} }
break;
case OUTLINER_IDOP_RENAME: case OUTLINER_IDOP_RENAME:
{ {
/* rename */ /* rename */
@@ -916,9 +912,8 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL); WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL);
ED_undo_push(C, "Rename"); ED_undo_push(C, "Rename");
break;
} }
break;
case OUTLINER_IDOP_SELECT_LINKED: case OUTLINER_IDOP_SELECT_LINKED:
outliner_do_libdata_operation(C, scene, soops, &soops->tree, id_select_linked_cb); outliner_do_libdata_operation(C, scene, soops, &soops->tree, id_select_linked_cb);
ED_undo_push(C, "Select"); ED_undo_push(C, "Select");

30
source/blender/editors/space_outliner/outliner_tree.c
View File

@@ -616,18 +616,18 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
case ID_LI: case ID_LI:
{ {
te->name = ((Library *)id)->name; te->name = ((Library *)id)->name;
break;
} }
break;
case ID_SCE: case ID_SCE:
{ {
outliner_add_scene_contents(soops, &te->subtree, (Scene *)id, te); outliner_add_scene_contents(soops, &te->subtree, (Scene *)id, te);
break;
} }
break;
case ID_OB: case ID_OB:
{ {
outliner_add_object_contents(soops, te, tselem, (Object *)id); outliner_add_object_contents(soops, te, tselem, (Object *)id);
break;
} }
break;
case ID_ME: case ID_ME:
{ {
Mesh *me = (Mesh *)id; Mesh *me = (Mesh *)id;
@@ -641,8 +641,8 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
outliner_add_element(soops, &te->subtree, me->mat[a], te, 0, a); outliner_add_element(soops, &te->subtree, me->mat[a], te, 0, a);
/* could do tfaces with image links, but the images are not grouped nicely. /* could do tfaces with image links, but the images are not grouped nicely.
* would require going over all tfaces, sort images in use. etc... */ * would require going over all tfaces, sort images in use. etc... */
break;
} }
break;
case ID_CU: case ID_CU:
{ {
Curve *cu = (Curve *)id; Curve *cu = (Curve *)id;
@@ -653,8 +653,8 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
for (a = 0; a < cu->totcol; a++) for (a = 0; a < cu->totcol; a++)
outliner_add_element(soops, &te->subtree, cu->mat[a], te, 0, a); outliner_add_element(soops, &te->subtree, cu->mat[a], te, 0, a);
break;
} }
break;
case ID_MB: case ID_MB:
{ {
MetaBall *mb = (MetaBall *)id; MetaBall *mb = (MetaBall *)id;
@@ -665,8 +665,8 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
for (a = 0; a < mb->totcol; a++) for (a = 0; a < mb->totcol; a++)
outliner_add_element(soops, &te->subtree, mb->mat[a], te, 0, a); outliner_add_element(soops, &te->subtree, mb->mat[a], te, 0, a);
break;
} }
break;
case ID_MA: case ID_MA:
{ {
Material *ma = (Material *)id; Material *ma = (Material *)id;
@@ -678,8 +678,8 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
for (a = 0; a < MAX_MTEX; a++) { for (a = 0; a < MAX_MTEX; a++) {
if (ma->mtex[a]) outliner_add_element(soops, &te->subtree, ma->mtex[a]->tex, te, 0, a); if (ma->mtex[a]) outliner_add_element(soops, &te->subtree, ma->mtex[a]->tex, te, 0, a);
} }
break;
} }
break;
case ID_TE: case ID_TE:
{ {
Tex *tex = (Tex *)id; Tex *tex = (Tex *)id;
@@ -688,16 +688,16 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
outliner_add_element(soops, &te->subtree, tex, te, TSE_ANIM_DATA, 0); outliner_add_element(soops, &te->subtree, tex, te, TSE_ANIM_DATA, 0);
outliner_add_element(soops, &te->subtree, tex->ima, te, 0, 0); outliner_add_element(soops, &te->subtree, tex->ima, te, 0, 0);
break;
} }
break;
case ID_CA: case ID_CA:
{ {
Camera *ca = (Camera *)id; Camera *ca = (Camera *)id;
if (outliner_animdata_test(ca->adt)) if (outliner_animdata_test(ca->adt))
outliner_add_element(soops, &te->subtree, ca, te, TSE_ANIM_DATA, 0); outliner_add_element(soops, &te->subtree, ca, te, TSE_ANIM_DATA, 0);
break;
} }
break;
case ID_LA: case ID_LA:
{ {
Lamp *la = (Lamp *)id; Lamp *la = (Lamp *)id;
@@ -709,16 +709,16 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
for (a = 0; a < MAX_MTEX; a++) { for (a = 0; a < MAX_MTEX; a++) {
if (la->mtex[a]) outliner_add_element(soops, &te->subtree, la->mtex[a]->tex, te, 0, a); if (la->mtex[a]) outliner_add_element(soops, &te->subtree, la->mtex[a]->tex, te, 0, a);
} }
break;
} }
break;
case ID_SPK: case ID_SPK:
{ {
Speaker *spk = (Speaker *)id; Speaker *spk = (Speaker *)id;
if (outliner_animdata_test(spk->adt)) if (outliner_animdata_test(spk->adt))
outliner_add_element(soops, &te->subtree, spk, te, TSE_ANIM_DATA, 0); outliner_add_element(soops, &te->subtree, spk, te, TSE_ANIM_DATA, 0);
break;
} }
break;
case ID_WO: case ID_WO:
{ {
World *wrld = (World *)id; World *wrld = (World *)id;
@@ -730,22 +730,22 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
for (a = 0; a < MAX_MTEX; a++) { for (a = 0; a < MAX_MTEX; a++) {
if (wrld->mtex[a]) outliner_add_element(soops, &te->subtree, wrld->mtex[a]->tex, te, 0, a); if (wrld->mtex[a]) outliner_add_element(soops, &te->subtree, wrld->mtex[a]->tex, te, 0, a);
} }
break;
} }
break;
case ID_KE: case ID_KE:
{ {
Key *key = (Key *)id; Key *key = (Key *)id;
if (outliner_animdata_test(key->adt)) if (outliner_animdata_test(key->adt))
outliner_add_element(soops, &te->subtree, key, te, TSE_ANIM_DATA, 0); outliner_add_element(soops, &te->subtree, key, te, TSE_ANIM_DATA, 0);
break;
} }
break;
case ID_AC: case ID_AC:
{ {
// XXX do we want to be exposing the F-Curves here? // XXX do we want to be exposing the F-Curves here?
//bAction *act = (bAction *)id; //bAction *act = (bAction *)id;
break;
} }
break;
case ID_AR: case ID_AR:
{ {
bArmature *arm = (bArmature *)id; bArmature *arm = (bArmature *)id;
@@ -791,8 +791,8 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
} }
} }
} }
break;
} }
break;
} }
} }

2
source/blender/editors/space_time/space_time.c
View File

@@ -435,8 +435,8 @@ static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
break; break;
} }
} }
break;
} }
break;
} }
break; break;
} }

18
source/blender/editors/space_view3d/drawarmature.c
View File

@@ -186,8 +186,6 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
return true; return true;
} }
break;
case PCHAN_COLOR_SOLID: case PCHAN_COLOR_SOLID:
{ {
if (bcolor) { if (bcolor) {
@@ -198,8 +196,6 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
return true; return true;
} }
break;
case PCHAN_COLOR_CONSTS: case PCHAN_COLOR_CONSTS:
{ {
if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) { if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) {
@@ -210,11 +206,8 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
return true; return true;
} }
else return false;
return 0;
} }
break;
case PCHAN_COLOR_SPHEREBONE_BASE: case PCHAN_COLOR_SPHEREBONE_BASE:
{ {
if (bcolor) { if (bcolor) {
@@ -240,7 +233,6 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
return true; return true;
} }
break;
case PCHAN_COLOR_SPHEREBONE_END: case PCHAN_COLOR_SPHEREBONE_END:
{ {
if (bcolor) { if (bcolor) {
@@ -266,9 +258,8 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
else if (boneflag & BONE_SELECTED) UI_ThemeColorShade(TH_BONE_POSE, -30); else if (boneflag & BONE_SELECTED) UI_ThemeColorShade(TH_BONE_POSE, -30);
else UI_ThemeColorShade(TH_BONE_SOLID, -30); else UI_ThemeColorShade(TH_BONE_SOLID, -30);
} }
break;
} }
break;
case PCHAN_COLOR_LINEBONE: case PCHAN_COLOR_LINEBONE:
{ {
/* inner part in background color or constraint */ /* inner part in background color or constraint */
@@ -290,7 +281,6 @@ static bool set_pchan_glColor(short colCode, int boneflag, short constflag)
return true; return true;
} }
break;
} }
return false; return false;
@@ -1426,8 +1416,8 @@ static void pchan_draw_IK_root_lines(bPoseChannel *pchan, short only_temp)
glEnd(); glEnd();
setlinestyle(0); setlinestyle(0);
break;
} }
break;
case CONSTRAINT_TYPE_SPLINEIK: case CONSTRAINT_TYPE_SPLINEIK:
{ {
bSplineIKConstraint *data = (bSplineIKConstraint *)con->data; bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
@@ -1451,8 +1441,8 @@ static void pchan_draw_IK_root_lines(bPoseChannel *pchan, short only_temp)
glEnd(); glEnd();
setlinestyle(0); setlinestyle(0);
break;
} }
break;
} }
} }
} }

2
source/blender/editors/transform/transform.c
View File

@@ -2002,8 +2002,8 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *even
initBoneEnvelope(t); initBoneEnvelope(t);
else else
initBoneSize(t); initBoneSize(t);
break;
} }
break;
case TFM_BONE_ENVELOPE: case TFM_BONE_ENVELOPE:
initBoneEnvelope(t); initBoneEnvelope(t);
break; break;

2
source/blender/editors/transform/transform_constraints.c
View File

@@ -621,8 +621,8 @@ void setUserConstraint(TransInfo *t, short orientation, int mode, const char fte
float mtx[3][3] = MAT3_UNITY; float mtx[3][3] = MAT3_UNITY;
BLI_snprintf(text, sizeof(text), ftext, IFACE_("global")); BLI_snprintf(text, sizeof(text), ftext, IFACE_("global"));
setConstraint(t, mtx, mode, text); setConstraint(t, mtx, mode, text);
break;
} }
break;
case V3D_MANIP_LOCAL: case V3D_MANIP_LOCAL:
BLI_snprintf(text, sizeof(text), ftext, IFACE_("local")); BLI_snprintf(text, sizeof(text), ftext, IFACE_("local"));
setLocalConstraint(t, mode, text); setLocalConstraint(t, mode, text);

12
source/blender/makesrna/intern/rna_color.c
View File

@@ -252,9 +252,8 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr)
RNA_pointer_create(id, &RNA_ColorRamp, ma->ramp_spec, &ramp_ptr); RNA_pointer_create(id, &RNA_ColorRamp, ma->ramp_spec, &ramp_ptr);
COLRAMP_GETPATH; COLRAMP_GETPATH;
} }
break;
} }
break;
case ID_NT: case ID_NT:
{ {
bNodeTree *ntree = (bNodeTree *)id; bNodeTree *ntree = (bNodeTree *)id;
@@ -266,9 +265,8 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr)
COLRAMP_GETPATH; COLRAMP_GETPATH;
} }
} }
break;
} }
break;
case ID_LS: case ID_LS:
{ {
ListBase listbase; ListBase listbase;
@@ -312,8 +310,8 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *
DAG_id_tag_update(&ma->id, 0); DAG_id_tag_update(&ma->id, 0);
WM_main_add_notifier(NC_MATERIAL | ND_SHADING_DRAW, ma); WM_main_add_notifier(NC_MATERIAL | ND_SHADING_DRAW, ma);
break;
} }
break;
case ID_NT: case ID_NT:
{ {
bNodeTree *ntree = (bNodeTree *)id; bNodeTree *ntree = (bNodeTree *)id;
@@ -324,16 +322,16 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *
ED_node_tag_update_nodetree(bmain, ntree); ED_node_tag_update_nodetree(bmain, ntree);
} }
} }
break;
} }
break;
case ID_TE: case ID_TE:
{ {
Tex *tex = ptr->id.data; Tex *tex = ptr->id.data;
DAG_id_tag_update(&tex->id, 0); DAG_id_tag_update(&tex->id, 0);
WM_main_add_notifier(NC_TEXTURE, tex); WM_main_add_notifier(NC_TEXTURE, tex);
break;
} }
break;
case ID_LS: case ID_LS:
{ {
FreestyleLineStyle *linestyle = ptr->id.data; FreestyleLineStyle *linestyle = ptr->id.data;

4
source/blender/makesrna/intern/rna_object.c
View File

@@ -983,8 +983,8 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value)
case OB_BODY_TYPE_CHARACTER: case OB_BODY_TYPE_CHARACTER:
ob->gameflag |= OB_COLLISION | OB_GHOST | OB_CHARACTER; ob->gameflag |= OB_COLLISION | OB_GHOST | OB_CHARACTER;
ob->gameflag &= ~(OB_SENSOR | OB_OCCLUDER | OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_ACTOR | ob->gameflag &= ~(OB_SENSOR | OB_OCCLUDER | OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_ACTOR |
OB_ANISOTROPIC_FRICTION | OB_DO_FH | OB_ROT_FH | OB_COLLISION_RESPONSE | OB_NAVMESH); OB_ANISOTROPIC_FRICTION | OB_DO_FH | OB_ROT_FH | OB_COLLISION_RESPONSE | OB_NAVMESH);
break; break;
case OB_BODY_TYPE_STATIC: case OB_BODY_TYPE_STATIC:
ob->gameflag |= OB_COLLISION; ob->gameflag |= OB_COLLISION;
ob->gameflag &= ~(OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_OCCLUDER | OB_CHARACTER | OB_SENSOR | OB_NAVMESH); ob->gameflag &= ~(OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_OCCLUDER | OB_CHARACTER | OB_SENSOR | OB_NAVMESH);

30
source/blender/nodes/shader/nodes/node_shader_math.c
View File

@@ -64,32 +64,32 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
out[0]->vec[0] = 0.0; out[0]->vec[0] = 0.0;
else else
out[0]->vec[0] = in[0]->vec[0] / in[1]->vec[0]; out[0]->vec[0] = in[0]->vec[0] / in[1]->vec[0];
break;
} }
break;
case 4: /* Sine */ case 4: /* Sine */
{ {
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */ if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = sin(in[0]->vec[0]); out[0]->vec[0] = sin(in[0]->vec[0]);
else else
out[0]->vec[0] = sin(in[1]->vec[0]); out[0]->vec[0] = sin(in[1]->vec[0]);
break;
} }
break;
case 5: /* Cosine */ case 5: /* Cosine */
{ {
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */ if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = cos(in[0]->vec[0]); out[0]->vec[0] = cos(in[0]->vec[0]);
else else
out[0]->vec[0] = cos(in[1]->vec[0]); out[0]->vec[0] = cos(in[1]->vec[0]);
break;
} }
break;
case 6: /* Tangent */ case 6: /* Tangent */
{ {
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */ if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = tan(in[0]->vec[0]); out[0]->vec[0] = tan(in[0]->vec[0]);
else else
out[0]->vec[0] = tan(in[1]->vec[0]); out[0]->vec[0] = tan(in[1]->vec[0]);
break;
} }
break;
case 7: /* Arc-Sine */ case 7: /* Arc-Sine */
{ {
if (in[0]->hasinput || !in[1]->hasinput) { /* This one only takes one input, so we've got to choose. */ if (in[0]->hasinput || !in[1]->hasinput) { /* This one only takes one input, so we've got to choose. */
@@ -106,8 +106,8 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
else else
out[0]->vec[0] = 0.0; out[0]->vec[0] = 0.0;
} }
break;
} }
break;
case 8: /* Arc-Cosine */ case 8: /* Arc-Cosine */
{ {
if (in[0]->hasinput || !in[1]->hasinput) { /* This one only takes one input, so we've got to choose. */ if (in[0]->hasinput || !in[1]->hasinput) { /* This one only takes one input, so we've got to choose. */
@@ -124,16 +124,16 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
else else
out[0]->vec[0] = 0.0; out[0]->vec[0] = 0.0;
} }
break;
} }
break;
case 9: /* Arc-Tangent */ case 9: /* Arc-Tangent */
{ {
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */ if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = atan(in[0]->vec[0]); out[0]->vec[0] = atan(in[0]->vec[0]);
else else
out[0]->vec[0] = atan(in[1]->vec[0]); out[0]->vec[0] = atan(in[1]->vec[0]);
break;
} }
break;
case 10: /* Power */ case 10: /* Power */
{ {
/* Only raise negative numbers by full integers */ /* Only raise negative numbers by full integers */
@@ -152,8 +152,8 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
} }
} }
break;
} }
break;
case 11: /* Logarithm */ case 11: /* Logarithm */
{ {
/* Don't want any imaginary numbers... */ /* Don't want any imaginary numbers... */
@@ -161,56 +161,56 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
out[0]->vec[0] = log(in[0]->vec[0]) / log(in[1]->vec[0]); out[0]->vec[0] = log(in[0]->vec[0]) / log(in[1]->vec[0]);
else else
out[0]->vec[0] = 0.0; out[0]->vec[0] = 0.0;
break;
} }
break;
case 12: /* Minimum */ case 12: /* Minimum */
{ {
if (in[0]->vec[0] < in[1]->vec[0]) if (in[0]->vec[0] < in[1]->vec[0])
out[0]->vec[0] = in[0]->vec[0]; out[0]->vec[0] = in[0]->vec[0];
else else
out[0]->vec[0] = in[1]->vec[0]; out[0]->vec[0] = in[1]->vec[0];
break;
} }
break;
case 13: /* Maximum */ case 13: /* Maximum */
{ {
if (in[0]->vec[0] > in[1]->vec[0]) if (in[0]->vec[0] > in[1]->vec[0])
out[0]->vec[0] = in[0]->vec[0]; out[0]->vec[0] = in[0]->vec[0];
else else
out[0]->vec[0] = in[1]->vec[0]; out[0]->vec[0] = in[1]->vec[0];
break;
} }
break;
case 14: /* Round */ case 14: /* Round */
{ {
if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */ if (in[0]->hasinput || !in[1]->hasinput) /* This one only takes one input, so we've got to choose. */
out[0]->vec[0] = (in[0]->vec[0] < 0) ? (int)(in[0]->vec[0] - 0.5f) : (int)(in[0]->vec[0] + 0.5f); out[0]->vec[0] = (in[0]->vec[0] < 0) ? (int)(in[0]->vec[0] - 0.5f) : (int)(in[0]->vec[0] + 0.5f);
else else
out[0]->vec[0] = (in[1]->vec[0] < 0) ? (int)(in[1]->vec[0] - 0.5f) : (int)(in[1]->vec[0] + 0.5f); out[0]->vec[0] = (in[1]->vec[0] < 0) ? (int)(in[1]->vec[0] - 0.5f) : (int)(in[1]->vec[0] + 0.5f);
break;
} }
break;
case 15: /* Less Than */ case 15: /* Less Than */
{ {
if (in[0]->vec[0] < in[1]->vec[0]) if (in[0]->vec[0] < in[1]->vec[0])
out[0]->vec[0] = 1.0f; out[0]->vec[0] = 1.0f;
else else
out[0]->vec[0] = 0.0f; out[0]->vec[0] = 0.0f;
break;
} }
break;
case 16: /* Greater Than */ case 16: /* Greater Than */
{ {
if (in[0]->vec[0] > in[1]->vec[0]) if (in[0]->vec[0] > in[1]->vec[0])
out[0]->vec[0] = 1.0f; out[0]->vec[0] = 1.0f;
else else
out[0]->vec[0] = 0.0f; out[0]->vec[0] = 0.0f;
break;
} }
break;
case 17: /* Modulo */ case 17: /* Modulo */
{ {
if (in[1]->vec[0] == 0.0f) if (in[1]->vec[0] == 0.0f)
out[0]->vec[0] = 0.0f; out[0]->vec[0] = 0.0f;
else else
out[0]->vec[0] = fmod(in[0]->vec[0], in[1]->vec[0]); out[0]->vec[0] = fmod(in[0]->vec[0], in[1]->vec[0]);
break;
} }
break;
} }
} }

4
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -1638,8 +1638,8 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
ED_fileselect_set_params(sfile); ED_fileselect_set_params(sfile);
action = WM_HANDLER_BREAK; action = WM_HANDLER_BREAK;
break;
} }
break;
case EVT_FILESELECT_EXEC: case EVT_FILESELECT_EXEC:
case EVT_FILESELECT_CANCEL: case EVT_FILESELECT_CANCEL:
@@ -1734,8 +1734,8 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
wm_event_free_handler(handler); wm_event_free_handler(handler);
action = WM_HANDLER_BREAK; action = WM_HANDLER_BREAK;
break;
} }
break;
} }
return action; return action;