Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-25 19:18:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-25 19:20:40 +0300
commitcfc2fa33bfcd1517731a266b9169b3d6a5b80ced (patch)
tree5d495642f6b62d99efcc11458f6dc297cfc754fe /source/blender/editors/transform
parentf1317140561bc5f3af81296b081c1922d62ce67f (diff)
Fix transform scale header printing
Clearing constrained axes caused the scale not to print correctly.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index e4967e172eb..487adf29ad8 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -3828,16 +3828,24 @@ static void applyResize(TransInfo *t, const int UNUSED(mval[2]))
t->con.applySize(t, NULL, NULL, mat);
/* Only so we have re-usable value with redo. */
+ float pvec[3] = {0.0f, 0.0f, 0.0f};
+ int j = 0;
for (i = 0; i < 3; i++) {
if (!(t->con.mode & (CON_AXIS0 << i))) {
t->values[i] = 1.0f;
}
+ else {
+ pvec[j++] = t->values[i];
+ }
}
+ headerResize(t, pvec, str);
+ }
+ else {
+ headerResize(t, t->values, str);
}
copy_m3_m3(t->mat, mat); // used in gizmo
- headerResize(t, t->values, str);
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
TransData *td = tc->data;