diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-05-31 21:19:29 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-06-01 00:28:52 +0300 |
commit | 14af27e63d38d736f8287897df223bad4d5c9501 (patch) | |
tree | 42962a0cbc10b63dbab30f1d70b1d532dd9a1f63 | |
parent | 4cb883b6b2119385bbb4d1af050b491a62f52e4a (diff) |
Fix T77194: Force global orientation on select constraint (Shift MMB) not working
This feature was a hack to prevent mmb select to print the orientation from menu in pre 2.80 versions.
Removing this feature as it is no longer an issue.
-rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_constraints.c | 18 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_constraints.h | 2 |
3 files changed, 8 insertions, 14 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 5fc65522fe6..c9df210ccc2 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1195,7 +1195,7 @@ int transformEvent(TransInfo *t, const wmEvent *event) stopConstraint(t); } else { - initSelectConstraint(t, event->shift); + initSelectConstraint(t); postSelectConstraint(t); } } diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 228e8d58162..0347522b8e8 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -876,21 +876,15 @@ void stopConstraint(TransInfo *t) /*------------------------- MMB Select -------------------------------*/ -void initSelectConstraint(TransInfo *t, bool force_global) +void initSelectConstraint(TransInfo *t) { - short orientation; - if (force_global) { - orientation = V3D_ORIENT_GLOBAL; - } - else { - if (t->orient_curr == 0) { - t->orient_curr = 1; - transform_orientations_current_set(t, t->orient_curr); - } - orientation = t->orient[t->orient_curr].type; + if (t->orient_curr == 0) { + t->orient_curr = 1; + transform_orientations_current_set(t, t->orient_curr); } - setUserConstraint(t, orientation, CON_APPLY | CON_SELECT, ""); + short orientation = t->orient[t->orient_curr].type; + setUserConstraint(t, orientation, CON_APPLY | CON_SELECT, "%s"); setNearestAxis(t); } diff --git a/source/blender/editors/transform/transform_constraints.h b/source/blender/editors/transform/transform_constraints.h index b57a7599321..c41b9361ca4 100644 --- a/source/blender/editors/transform/transform_constraints.h +++ b/source/blender/editors/transform/transform_constraints.h @@ -35,7 +35,7 @@ void drawConstraint(TransInfo *t); void drawPropCircle(const struct bContext *C, TransInfo *t); void startConstraint(TransInfo *t); void stopConstraint(TransInfo *t); -void initSelectConstraint(TransInfo *t, bool force_global); +void initSelectConstraint(TransInfo *t); void selectConstraint(TransInfo *t); void postSelectConstraint(TransInfo *t); void setNearestAxis(TransInfo *t); |