diff options
author | Martin Poirier <theeth@yahoo.com> | 2005-04-01 01:02:35 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2005-04-01 01:02:35 +0400 |
commit | 7532aa248f86571dc456f6247c507f110c4388b0 (patch) | |
tree | e1f444b698facac390dacce9268b51c340f41597 /source/blender/src/transform_numinput.c | |
parent | cbc04194e5e7d6c4ddb3672fd5260e292b02670a (diff) |
Transform fixes
Connected PET for mesh had an infinite loop in some case. Fixed an made a bit faster.
Renamed the numinput flag.
Corrected a conflict in TransInfo flags. This was a crash waiting to happen.
NO_CONSTRAINT flag now correctly used to disable MMB and constraint hotkeys when needed.
Added check for the manipulator flag when drawing them before applying transformation matrix. Was really weird when doing MMB with rotation.
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 e051f60e8f0..262ff79c64b 100755 --- a/source/blender/src/transform_numinput.c +++ b/source/blender/src/transform_numinput.c @@ -66,7 +66,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->flag & AFFECTALL && n->idx != j && n->ctrl[j] == 0) + if (n->flag & NUM_AFFECT_ALL && n->idx != j && n->ctrl[j] == 0) i = 0; else i = j; @@ -124,15 +124,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->flag & AFFECTALL && n->idx != j && n->ctrl[j] == 0) + if (n->flag & NUM_AFFECT_ALL && n->idx != j && n->ctrl[j] == 0) i = 0; else i = j; - if (n->ctrl[i] == 0 && n->flag & NULLONE) { + if (n->ctrl[i] == 0 && n->flag & NUM_NULL_ONE) { vec[j] = 1.0f; } - else if (n->val[i] == 0.0f && n->flag & NOZERO) { + else if (n->val[i] == 0.0f && n->flag & NUM_NO_ZERO) { vec[j] = 0.0001f; } else { @@ -164,7 +164,7 @@ char handleNumInput(NumInput *n, unsigned short event) break; case PERIODKEY: case PADPERIOD: - if (n->flag & NOFRACTION) + if (n->flag & NUM_NO_FRACTION) break; switch (n->ctrl[idx]) @@ -178,7 +178,7 @@ char handleNumInput(NumInput *n, unsigned short event) } break; case MINUSKEY: - if (n->flag & NONEGATIVE) + if (n->flag & NUM_NO_NEGATIVE) break; if (n->ctrl[idx]) { |