blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Transform: Improve event detection for AutoConstrain 

The event "value" is not really required since this operation works as a toogle.

This change cleans and simplifies the code.
This commit is contained in:
Germano Cavalcante 2020-11-26 13:42:48 -03:00
parent dd0e2da00e
commit 9add12ff05
3 changed files with 26 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -5037,8 +5037,8 @@ def km_transform_modal_map(_params):
("AUTOIK_CHAIN_LEN_UP", {"type": 'WHEELDOWNMOUSE', "value": 'PRESS', "shift": True}, None),
("AUTOIK_CHAIN_LEN_DOWN", {"type": 'WHEELUPMOUSE', "value": 'PRESS', "shift": True}, None),
("INSERTOFS_TOGGLE_DIR", {"type": 'T', "value": 'PRESS'}, None),
("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
("AUTOCONSTRAINPLANE", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'ANY'}, None),
("AUTOCONSTRAINPLANE", {"type": 'MIDDLEMOUSE', "value": 'ANY', "shift": True}, None),
])
return keymap

4
release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
View File

@ -3942,8 +3942,8 @@ def km_transform_modal_map(_params):
("AUTOIK_CHAIN_LEN_UP", {"type": 'WHEELDOWNMOUSE', "value": 'PRESS', "shift": True}, None),
("AUTOIK_CHAIN_LEN_DOWN", {"type": 'WHEELUPMOUSE', "value": 'PRESS', "shift": True}, None),
("INSERTOFS_TOGGLE_DIR", {"type": 'T', "value": 'PRESS'}, None),
("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
("AUTOCONSTRAINPLANE", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'ANY'}, None),
("AUTOCONSTRAINPLANE", {"type": 'MIDDLEMOUSE', "value": 'ANY', "shift": True}, None),
])
return keymap

69
source/blender/editors/transform/transform.c
View File

@ -1083,25 +1083,32 @@ int transformEvent(TransInfo *t, const wmEvent *event)
case TFM_MODAL_AUTOCONSTRAINT:
case TFM_MODAL_AUTOCONSTRAINTPLANE:
if ((t->flag & T_NO_CONSTRAINT) == 0) {
/* exception for switching to dolly, or trackball, in camera view */
if (t->flag & T_CAMERA) {
if (t->mode == TFM_TRANSLATION) {
setLocalConstraint(t, (CON_AXIS2), TIP_("along local Z"));
}
else if (t->mode == TFM_ROTATION) {
restoreTransObjects(t);
transform_mode_init(t, NULL, TFM_TRACKBALL);
}
if (t->modifiers & (MOD_CONSTRAINT_SELECT | MOD_CONSTRAINT_PLANE)) {
/* Confirm. */
postSelectConstraint(t);
t->modifiers &= ~(MOD_CONSTRAINT_SELECT | MOD_CONSTRAINT_PLANE);
}
else {
t->modifiers |= (event->val == TFM_MODAL_AUTOCONSTRAINT) ? MOD_CONSTRAINT_SELECT :
MOD_CONSTRAINT_PLANE;
if (t->con.mode & CON_APPLY) {
stopConstraint(t);
if (t->flag & T_CAMERA) {
/* Exception for switching to dolly, or trackball, in camera view. */
if (t->mode == TFM_TRANSLATION) {
setLocalConstraint(t, (CON_AXIS2), TIP_("along local Z"));
}
else if (t->mode == TFM_ROTATION) {
restoreTransObjects(t);
transform_mode_init(t, NULL, TFM_TRACKBALL);
}
}
else {
initSelectConstraint(t);
postSelectConstraint(t);
t->modifiers |= (event->val == TFM_MODAL_AUTOCONSTRAINT) ? MOD_CONSTRAINT_SELECT :
MOD_CONSTRAINT_PLANE;
if (t->con.mode & CON_APPLY) {
stopConstraint(t);
}
else {
initSelectConstraint(t);
postSelectConstraint(t);
}
}
}
t->redraw |= TREDRAW_HARD;
@ -1203,38 +1210,6 @@ int transformEvent(TransInfo *t, const wmEvent *event)
handled = true;
}
break;
case EVENT_NONE:
case INBETWEEN_MOUSEMOVE:
case INPUTCHANGE:
case WINDEACTIVATE:
case TIMER:
case TIMERJOBS:
case TIMERAUTOSAVE:
case TIMERREPORT:
case TIMERREGION:
case TIMERNOTIFIER:
case TIMERF:
/* Although rare, prevent these events from affecting the state of the modifiers. */
break;
default: {
if (event->type == t->launch_event) {
/* The user can hold the launch button and release it here. */
break;
}
/* Disable modifiers. */
int modifiers = t->modifiers;
modifiers &= ~MOD_CONSTRAINT_SELECT;
modifiers &= ~MOD_CONSTRAINT_PLANE;
if (modifiers != t->modifiers) {
if (t->modifiers & (MOD_CONSTRAINT_SELECT | MOD_CONSTRAINT_PLANE)) {
postSelectConstraint(t);
}
t->modifiers = modifiers;
t->redraw |= TREDRAW_HARD;
handled = true;
}
break;
}
}
/* confirm transform if launch key is released after mouse move */