diff options
author | Martin Poirier <theeth@yahoo.com> | 2005-03-17 00:55:57 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2005-03-17 00:55:57 +0300 |
commit | 07c26eb39717c33332e39287d3217834cf56b817 (patch) | |
tree | fd85fb1976d60ac5583b3c7c5263590d013f4782 /source/blender/src/transform_numinput.c | |
parent | 1b61771d9ec0a2f88f7d13f4ae936938fbc168c6 (diff) |
Fixed constraint center calculation. Much smarter to do it when calculating transformation center...
Fixed Extrude constraint. Needed to premul the normal by the object's matrix to but it in global space.
Also, moved the Locking Axis modifier (for constraints) from Alt to Shift. Alt was conflicting with middle mouse button emulation (reported in the test builds forum).
Tilt Transformation.
Diffstat (limited to 'source/blender/src/transform_numinput.c')
-rwxr-xr-x | source/blender/src/transform_numinput.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/src/transform_numinput.c b/source/blender/src/transform_numinput.c index c83955f46f7..dcf582b41e7 100755 --- a/source/blender/src/transform_numinput.c +++ b/source/blender/src/transform_numinput.c @@ -67,7 +67,7 @@ void outputNumInput(NumInput *n, char *str) for (j=0; j<=n->idx_max; j++) { /* if AFFECTALL and no number typed and cursor not on number, use first number */ - if (n->flags & AFFECTALL && n->idx != j && n->ctrl[j] == 0) + if (n->flag & AFFECTALL && n->idx != j && n->ctrl[j] == 0) i = 0; else i = j; @@ -125,15 +125,15 @@ void applyNumInput(NumInput *n, float *vec) if (hasNumInput(n)) { for (j=0; j<=n->idx_max; j++) { /* if AFFECTALL and no number typed and cursor not on number, use first number */ - if (n->flags & AFFECTALL && n->idx != j && n->ctrl[j] == 0) + if (n->flag & AFFECTALL && n->idx != j && n->ctrl[j] == 0) i = 0; else i = j; - if (n->ctrl[i] == 0 && n->flags & NULLONE) { + if (n->ctrl[i] == 0 && n->flag & NULLONE) { vec[j] = 1.0f; } - else if (n->val[i] == 0.0f && n->flags & NOZERO) { + else if (n->val[i] == 0.0f && n->flag & NOZERO) { vec[j] = 0.0001f; } else { @@ -165,7 +165,7 @@ char handleNumInput(NumInput *n, unsigned short event) break; case PERIODKEY: case PADPERIOD: - if (n->flags & NOFRACTION) + if (n->flag & NOFRACTION) break; switch (n->ctrl[idx]) @@ -179,7 +179,7 @@ char handleNumInput(NumInput *n, unsigned short event) } break; case MINUSKEY: - if (n->flags & NONEGATIVE) + if (n->flag & NONEGATIVE) break; if (n->ctrl[idx]) { |