diff options
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 84158fa51c7..37dacef4a96 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -702,7 +702,7 @@ static void recalcData_view3d(TransInfo *t) BKE_nurb_handles_calc(nu); /* Cant do testhandlesNurb here, it messes up the h1 and h2 flags */ nu = nu->next; } - } + } else { /* Normal updating */ while (nu) { @@ -961,9 +961,9 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) /* moving: is shown in drawobject() (transform color) */ // TRANSFORM_FIX_ME -// if (obedit || (t->flag & T_POSE) ) G.moving= G_TRANSFORM_EDIT; -// else if (G.f & G_PARTICLEEDIT) G.moving= G_TRANSFORM_PARTICLE; -// else G.moving= G_TRANSFORM_OBJ; +// if (obedit || (t->flag & T_POSE) ) G.moving = G_TRANSFORM_EDIT; +// else if (G.f & G_PARTICLEEDIT) G.moving = G_TRANSFORM_PARTICLE; +// else G.moving = G_TRANSFORM_OBJ; t->scene = sce; t->sa = sa; @@ -1211,7 +1211,7 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) /* TRANSFORM_FIX_ME rna restrictions */ if (t->prop_size <= 0.00001f) { - printf("Proportional size (%f) under 0.00001, reseting to 1!\n", t->prop_size); + printf("Proportional size (%f) under 0.00001, resetting to 1!\n", t->prop_size); t->prop_size = 1.0f; } @@ -1527,9 +1527,8 @@ void calculateCenterBound(TransInfo *t) copy_v3_v3(min, t->data[i].center); } } - add_v3_v3v3(t->center, min, max); - mul_v3_fl(t->center, 0.5); - + mid_v3_v3v3(t->center, min, max); + calculateCenter2D(t); } @@ -1671,8 +1670,9 @@ void calculatePropRatio(TransInfo *t) /* * 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->flag |= TD_NOACTION; + td->factor = 0.0f; restoreElement(td); } |