Commit: 5c54a609a9abe09a3c5dd235868893cec5a4c88a Author: Germano Cavalcante Date: Fri May 22 18:30:11 2020 -0300 Branches: master https://developer.blender.org/rB5c54a609a9abe09a3c5dd235868893cec5a4c88a
Cleanup: Remove unused flag =================================================================== M source/blender/editors/transform/transform.h M source/blender/editors/transform/transform_convert.c M source/blender/editors/transform/transform_generics.c M source/blender/editors/transform/transform_mode_align.c M source/blender/editors/transform/transform_mode_baketime.c M source/blender/editors/transform/transform_mode_bbone_resize.c M source/blender/editors/transform/transform_mode_bend.c M source/blender/editors/transform/transform_mode_boneenvelope.c M source/blender/editors/transform/transform_mode_boneroll.c M source/blender/editors/transform/transform_mode_curveshrinkfatten.c M source/blender/editors/transform/transform_mode_edge_bevelweight.c M source/blender/editors/transform/transform_mode_edge_crease.c M source/blender/editors/transform/transform_mode_edge_seq_slide.c M source/blender/editors/transform/transform_mode_gpopacity.c M source/blender/editors/transform/transform_mode_gpshrinkfatten.c M source/blender/editors/transform/transform_mode_maskshrinkfatten.c M source/blender/editors/transform/transform_mode_mirror.c M source/blender/editors/transform/transform_mode_push_pull.c M source/blender/editors/transform/transform_mode_resize.c M source/blender/editors/transform/transform_mode_rotate.c M source/blender/editors/transform/transform_mode_shear.c M source/blender/editors/transform/transform_mode_shrink_fatten.c M source/blender/editors/transform/transform_mode_skin_resize.c M source/blender/editors/transform/transform_mode_tilt.c M source/blender/editors/transform/transform_mode_tosphere.c M source/blender/editors/transform/transform_mode_trackball.c M source/blender/editors/transform/transform_mode_translate.c M source/blender/editors/transform/transform_snap.c =================================================================== diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 9cd9ddfd811..02218cbab10 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -610,56 +610,53 @@ enum { T_CURSOR = 1 << 5, /** Transform points, having no rotation/scale. */ T_POINTS = 1 << 6, - - /* empty slot - (1 << 7) */ - /** restrictions flags */ - T_NO_CONSTRAINT = 1 << 8, - T_NULL_ONE = 1 << 9, - T_NO_ZERO = 1 << 10, + T_NO_CONSTRAINT = 1 << 7, + T_NULL_ONE = 1 << 8, + T_NO_ZERO = 1 << 9, T_ALL_RESTRICTIONS = T_NO_CONSTRAINT | T_NULL_ONE | T_NO_ZERO, - T_PROP_EDIT = 1 << 11, - T_PROP_CONNECTED = 1 << 12, - T_PROP_PROJECTED = 1 << 13, + T_PROP_EDIT = 1 << 10, + T_PROP_CONNECTED = 1 << 11, + T_PROP_PROJECTED = 1 << 12, T_PROP_EDIT_ALL = T_PROP_EDIT | T_PROP_CONNECTED | T_PROP_PROJECTED, - T_V3D_ALIGN = 1 << 14, + T_V3D_ALIGN = 1 << 13, /** For 2d views like uv or fcurve. */ - T_2D_EDIT = 1 << 15, - T_CLIP_UV = 1 << 16, + T_2D_EDIT = 1 << 14, + T_CLIP_UV = 1 << 15, /** Auto-ik is on. */ - T_AUTOIK = 1 << 18, + T_AUTOIK = 1 << 16, /** Don't use mirror even if the data-block option is set. */ - T_NO_MIRROR = 1 << 19, + T_NO_MIRROR = 1 << 17, /** To indicate that the value set in the `value` parameter is the final * value of the transformation, modified only by the constrain. */ - T_INPUT_IS_VALUES_FINAL = 1 << 20, + T_INPUT_IS_VALUES_FINAL = 1 << 18, /** To specify if we save back settings at the end. */ - T_MODAL = 1 << 21, + T_MODAL = 1 << 19, /** No retopo. */ - T_NO_PROJECT = 1 << 22, + T_NO_PROJECT = 1 << 20, - T_RELEASE_CONFIRM = 1 << 23, + T_RELEASE_CONFIRM = 1 << 21, /** Alternative transformation. used to add offset to tracking markers. */ - T_ALT_TRANSFORM = 1 << 24, + T_ALT_TRANSFORM = 1 << 22, /** #TransInfo.center has been set, don't change it. */ - T_OVERRIDE_CENTER = 1 << 25, + T_OVERRIDE_CENTER = 1 << 23, - T_MODAL_CURSOR_SET = 1 << 26, + T_MODAL_CURSOR_SET = 1 << 24, - T_CLNOR_REBUILD = 1 << 27, + T_CLNOR_REBUILD = 1 << 25, /* Special Aftertrans. */ - T_AUTOMERGE = 1 << 28, - T_AUTOSPLIT = 1 << 29, + T_AUTOMERGE = 1 << 26, + T_AUTOSPLIT = 1 << 27, }; /** #TransInfo.modifiers */ @@ -706,40 +703,39 @@ enum { /** #TransData.flag */ enum { TD_SELECTED = 1 << 0, - TD_NOACTION = 1 << 2, - TD_USEQUAT = 1 << 3, - TD_NOTCONNECTED = 1 << 4, + TD_USEQUAT = 1 << 1, + TD_NOTCONNECTED = 1 << 2, /** Used for scaling of #MetaElem.rad */ - TD_SINGLESIZE = 1 << 5, + TD_SINGLESIZE = 1 << 3, /** Scale relative to individual element center */ - TD_INDIVIDUAL_SCALE = 1 << 8, - TD_NOCENTER = 1 << 9, + TD_INDIVIDUAL_SCALE = 1 << 4, + TD_NOCENTER = 1 << 5, /** #TransData.ext abused for particle key timing. */ - TD_NO_EXT = 1 << 10, + TD_NO_EXT = 1 << 6, /** don't transform this data */ - TD_SKIP = 1 << 11, + TD_SKIP = 1 << 7, /** if this is a bez triple, we need to restore the handles, * if this is set #TransData.hdata needs freeing */ - TD_BEZTRIPLE = 1 << 12, + TD_BEZTRIPLE = 1 << 8, /** when this is set, don't apply translation changes to this element */ - TD_NO_LOC = 1 << 13, + TD_NO_LOC = 1 << 9, /** For Graph Editor autosnap, indicates that point should not undergo autosnapping */ - TD_NOTIMESNAP = 1 << 14, + TD_NOTIMESNAP = 1 << 10, /** For Graph Editor - curves that can only have int-values * need their keyframes tagged with this. */ - TD_INTVALUES = 1 << 15, + TD_INTVALUES = 1 << 11, /** For editmode mirror, clamp axis to 0 */ - TD_MIRROR_EDGE_X = 1 << 16, - TD_MIRROR_EDGE_Y = 1 << 17, - TD_MIRROR_EDGE_Z = 1 << 18, + TD_MIRROR_EDGE_X = 1 << 12, + TD_MIRROR_EDGE_Y = 1 << 13, + TD_MIRROR_EDGE_Z = 1 << 14, /** For fcurve handles, move them along with their keyframes */ - TD_MOVEHANDLE1 = 1 << 19, - TD_MOVEHANDLE2 = 1 << 20, + TD_MOVEHANDLE1 = 1 << 15, + TD_MOVEHANDLE2 = 1 << 16, /** Exceptional case with pose bone rotating when a parent bone has 'Local Location' * option enabled and rotating also transforms it. */ - TD_PBONE_LOCAL_MTX_P = 1 << 21, + TD_PBONE_LOCAL_MTX_P = 1 << 17, /** Same as above but for a child bone. */ - TD_PBONE_LOCAL_MTX_C = 1 << 22, + TD_PBONE_LOCAL_MTX_C = 1 << 18, }; /** #TransSnap.status */ diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index b91542a80fc..ac69c2a60fe 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -827,10 +827,6 @@ void clipUVData(TransInfo *t) FOREACH_TRANS_DATA_CONTAINER (t, tc) { TransData *td = tc->data; for (int a = 0; a < tc->data_len; a++, td++) { - if (td->flag & TD_NOACTION) { - break; - } - if ((td->flag & TD_SKIP) || (!td->loc)) { continue; } @@ -2390,10 +2386,6 @@ void special_aftertrans_update(bContext *C, TransInfo *t) PTCacheID *pid; ob = td->ob; - if (td->flag & TD_NOACTION) { - break; - } - if (td->flag & TD_SKIP) { continue; } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index a16bc038902..1c91347d9fa 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -174,9 +174,6 @@ static void clipMirrorModifier(TransInfo *t) int clip; float loc[3], iloc[3]; - if (td->flag & TD_NOACTION) { - break; - } if (td->loc == NULL) { break; } @@ -1068,11 +1065,6 @@ static void recalcData_objects(TransInfo *t) for (int i = 0; i < tc->data_len; i++, td++) { Object *ob = td->ob; - - if (td->flag & TD_NOACTION) { - break; - } - if (td->flag & TD_SKIP) { continue; } @@ -2412,19 +2404,11 @@ void calculatePropRatio(TransInfo *t) } else if ((connected && (td->flag & TD_NOTCONNECTED || td->dist > t->prop_size)) || (connected == 0 && td->rdist > t->prop_size)) { - /* - * The elements are sorted according to their dist member in the array, - * that means we can stop when it finds one element outside of the propsize. - * do not set 'td->flag |= TD_NOACTION', the prop circle is being changed. - */ - td->factor = 0.0f; restoreElement(td); } else { /* Use rdist for falloff calculations, it is the real distance */ - td->flag &= ~TD_NOACTION; - if (connected) { dist = (t->prop_size - td->dist) / t->prop_size; } diff --git a/source/blender/editors/transform/transform_mode_align.c b/source/blender/editors/transform/transform_mode_align.c index 9bce793809b..4fd4599b940 100644 --- a/source/blender/editors/transform/transform_mode_align.c +++ b/source/blender/editors/transform/transform_mode_align.c @@ -52,10 +52,6 @@ static void applyAlign(TransInfo *t, const int UNUSED(mval[2])) for (i = 0; i < tc->data_len; i++, td++) { float mat[3][3], invmat[3][3]; - if (td->flag & TD_NOACTION) { - break; - } - if (td->flag & TD_SKIP) { continue; } diff --git a/source/blender/editors/transform/transform_mode_baketime.c b/source/blender/editors/transform/transform_mode_baketime.c index bb8fd0df13d..4e7fc3578ce 100644 --- a/source/blender/editors/transform/transform_mode_baketime.c +++ b/source/blender/editors/transform/transform_mode_baketime.c @@ -97,10 +97,6 @@ static void applyBakeTime(TransInfo *t, const int mval[2]) FOREACH_TRANS_DATA_CONTAINER (t, tc) { TransData *td = tc->data; for (i = 0; i < tc->data_len; i++, td++) { - if (td->flag & TD_NOACTION) { - break; - } - if (td->flag & TD_SKIP) { continue; } diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.c b/source/blender/editors/transform/transform_mode_bbone_resize.c index c81049ac379..77850e74785 100644 --- a/source/blender/editors/transform/transform_mode_bbone_resize.c +++ b/source/blender/editors/transform/transform_mode_bbone_resize.c @@ -141,10 +141,6 @@ static void applyBoneSize(TransInfo *t, const int UNUSED(mval[2])) FOREACH_TRANS_DATA_CONTAINER (t, tc) { TransData *td = tc->data; for (i = 0; i < tc->data_len; i++, td++) { - if (td->flag & TD_NOACTION) { - break; - } - if (td->flag & TD_SKIP) { continue; } diff --git a/source/blender/editors/transform/transform_mode_bend.c b/source/blender/editors/transform/transform_mode_bend.c index 721d226050a..3b51626b170 100644 --- a/source/blender/editors/transform/transform_mode_bend.c +++ b/source/blender/editors/transform/transform_mode_bend.c @@ -186,10 +186,6 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2])) float delta[3]; float fac, fac_scaled; - if (td->flag & TD_NOACTION) { - break; - } - if (td->flag & TD_SKIP) { continue; } diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.c b/source/blender/editors/transform/transform_mode_boneenvelope.c index aa20a5ade95..7045d190478 100644 --- a/source/blender/editors/transform/transform_mode_boneenvelope.c +++ b/source/blender/editors/transform/transform_mode_boneenvelope.c @@ -73,10 +73,6 @@ static void applyBoneEnvelope(TransInfo *t, const int UNUSED(mval[2])) FOREACH_TRANS_DATA_CONTAINER (t, tc) { TransData *td = tc->data; for (i = 0; i < tc->data_len; i++, td++) { - if (td->flag & TD_NOACTION) { - break; - } - if (td->flag & TD_SKIP) { continue; } diff --git a/source/blender/editors/transform/transform_mode_boneroll.c b/source/blender/editors/transform/transform_mode_boneroll.c index 0564a946148..1503519c519 100644 --- a/source/blender/editors/transform/transform_mode_boneroll.c +++ b/source/blender/editors @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs