blender
/
blender
136
411
Fork 593
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Germano Cavalcante 2021-05-24 12:30:24 -03:00
parent 1318cb26fe 1a69d491e5
commit 9c53690b30
4 changed files with 93 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,81 +724,92 @@ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf)
static bool transform_event_modal_constraint(TransInfo *t, short modal_type)
{
if (!(t->flag & T_NO_CONSTRAINT)) {
if (t->flag & T_2D_EDIT && ELEM(modal_type, TFM_MODAL_AXIS_Z, TFM_MODAL_PLANE_Z)) {
if (t->flag & T_NO_CONSTRAINT) {
return false;
}
if (t->flag & T_2D_EDIT && ELEM(modal_type, TFM_MODAL_AXIS_Z, TFM_MODAL_PLANE_Z)) {
return false;
}
int constraint_curr = -1;
if (t->modifiers & (MOD_CONSTRAINT_SELECT_AXIS | MOD_CONSTRAINT_SELECT_PLANE)) {
t->modifiers &= ~(MOD_CONSTRAINT_SELECT_AXIS | MOD_CONSTRAINT_SELECT_PLANE);
/* Avoid changing orientation in this case. */
constraint_curr = -2;
}
else if (t->con.mode & CON_APPLY) {
constraint_curr = t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2);
}
int constraint_new;
const char *msg_2d = "", *msg_3d = "";
/* Initialize */
switch (modal_type) {
case TFM_MODAL_AXIS_X:
msg_2d = TIP_("along X");
msg_3d = TIP_("along %s X");
constraint_new = CON_AXIS0;
break;
case TFM_MODAL_AXIS_Y:
msg_2d = TIP_("along Y");
msg_3d = TIP_("along %s Y");
constraint_new = CON_AXIS1;
break;
case TFM_MODAL_AXIS_Z:
msg_2d = TIP_("along Z");
msg_3d = TIP_("along %s Z");
constraint_new = CON_AXIS2;
break;
case TFM_MODAL_PLANE_X:
msg_3d = TIP_("locking %s X");
constraint_new = CON_AXIS1 | CON_AXIS2;
break;
case TFM_MODAL_PLANE_Y:
msg_3d = TIP_("locking %s Y");
constraint_new = CON_AXIS0 | CON_AXIS2;
break;
case TFM_MODAL_PLANE_Z:
msg_3d = TIP_("locking %s Z");
constraint_new = CON_AXIS0 | CON_AXIS1;
break;
default:
/* Invalid key */
return false;
}
if (t->flag & T_2D_EDIT) {
BLI_assert(modal_type < TFM_MODAL_PLANE_X);
if (constraint_new == CON_AXIS2) {
return false;
}
int constraint_curr = (t->con.mode & CON_APPLY) ?
t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2) :
-1;
int constraint_new;
const char *msg_2d = "", *msg_3d = "";
/* Initialize */
switch (modal_type) {
case TFM_MODAL_AXIS_X:
msg_2d = TIP_("along X");
msg_3d = TIP_("along %s X");
constraint_new = CON_AXIS0;
break;
case TFM_MODAL_AXIS_Y:
msg_2d = TIP_("along Y");
msg_3d = TIP_("along %s Y");
constraint_new = CON_AXIS1;
break;
case TFM_MODAL_AXIS_Z:
msg_2d = TIP_("along Z");
msg_3d = TIP_("along %s Z");
constraint_new = CON_AXIS2;
break;
case TFM_MODAL_PLANE_X:
msg_3d = TIP_("locking %s X");
constraint_new = CON_AXIS1 | CON_AXIS2;
break;
case TFM_MODAL_PLANE_Y:
msg_3d = TIP_("locking %s Y");
constraint_new = CON_AXIS0 | CON_AXIS2;
break;
case TFM_MODAL_PLANE_Z:
msg_3d = TIP_("locking %s Z");
constraint_new = CON_AXIS0 | CON_AXIS1;
break;
default:
/* Invalid key */
return false;
}
if (t->flag & T_2D_EDIT) {
BLI_assert(modal_type < TFM_MODAL_PLANE_X);
if (constraint_new == CON_AXIS2) {
return false;
}
if (constraint_curr == constraint_new) {
stopConstraint(t);
}
else {
setUserConstraint(t, constraint_new, msg_2d);
}
if (constraint_curr == constraint_new) {
stopConstraint(t);
}
else {
short orient_index = 1;
if (t->orient_curr == O_DEFAULT || ELEM(constraint_curr, -1, constraint_new)) {
/* Successive presses on existing axis, cycle orientation modes. */
orient_index = (short)((t->orient_curr + 1) % (int)ARRAY_SIZE(t->orient));
}
transform_orientations_current_set(t, orient_index);
if (orient_index == 0) {
stopConstraint(t);
}
else {
setUserConstraint(t, constraint_new, msg_3d);
}
setUserConstraint(t, constraint_new, msg_2d);
}
t->redraw |= TREDRAW_HARD;
return true;
}
return false;
else {
short orient_index = 1;
if (t->orient_curr == O_DEFAULT || ELEM(constraint_curr, -1, constraint_new)) {
/* Successive presses on existing axis, cycle orientation modes. */
orient_index = (short)((t->orient_curr + 1) % (int)ARRAY_SIZE(t->orient));
}
transform_orientations_current_set(t, orient_index);
if (orient_index == 0) {
stopConstraint(t);
}
else {
setUserConstraint(t, constraint_new, msg_3d);
}
}
t->redraw |= TREDRAW_HARD;
return true;
}
int transformEvent(TransInfo *t, const wmEvent *event)
@ -814,7 +825,7 @@ int transformEvent(TransInfo *t, const wmEvent *event)
handled = true;
}
else if (event->type == MOUSEMOVE) {
if (t->modifiers & (MOD_CONSTRAINT_SELECT | MOD_CONSTRAINT_PLANE)) {
if (t->modifiers & (MOD_CONSTRAINT_SELECT_AXIS | MOD_CONSTRAINT_SELECT_PLANE)) {
t->con.mode |= CON_SELECT;
}
@ -1062,10 +1073,10 @@ int transformEvent(TransInfo *t, const wmEvent *event)
t->state = TRANS_CONFIRM;
}
else if ((t->flag & T_NO_CONSTRAINT) == 0) {
if (t->modifiers & (MOD_CONSTRAINT_SELECT | MOD_CONSTRAINT_PLANE)) {
if (t->modifiers & (MOD_CONSTRAINT_SELECT_AXIS | MOD_CONSTRAINT_SELECT_PLANE)) {
/* Confirm. */
postSelectConstraint(t);
t->modifiers &= ~(MOD_CONSTRAINT_SELECT | MOD_CONSTRAINT_PLANE);
t->modifiers &= ~(MOD_CONSTRAINT_SELECT_AXIS | MOD_CONSTRAINT_SELECT_PLANE);
}
else {
if (t->options & CTX_CAMERA) {
@ -1079,8 +1090,9 @@ int transformEvent(TransInfo *t, const wmEvent *event)
}
}
else {
t->modifiers |= (event->val == TFM_MODAL_AUTOCONSTRAINT) ? MOD_CONSTRAINT_SELECT :
MOD_CONSTRAINT_PLANE;
t->modifiers |= (event->val == TFM_MODAL_AUTOCONSTRAINT) ?
MOD_CONSTRAINT_SELECT_AXIS :
MOD_CONSTRAINT_SELECT_PLANE;
if (t->con.mode & CON_APPLY) {
stopConstraint(t);
}

4
source/blender/editors/transform/transform.h
View File

@ -152,11 +152,11 @@ typedef enum {
/** #TransInfo.modifiers */
typedef enum {
MOD_CONSTRAINT_SELECT = 1 << 0,
MOD_CONSTRAINT_SELECT_AXIS = 1 << 0,
MOD_PRECISION = 1 << 1,
MOD_SNAP = 1 << 2,
MOD_SNAP_INVERT = 1 << 3,
MOD_CONSTRAINT_PLANE = 1 << 4,
MOD_CONSTRAINT_SELECT_PLANE = 1 << 4,
} eTModifier;
/** #TransSnap.status */

7
source/blender/editors/transform/transform_constraints.c
View File

@ -975,7 +975,6 @@ void initSelectConstraint(TransInfo *t)
}
setUserConstraint(t, CON_APPLY | CON_SELECT, "%s");
setNearestAxis(t);
}
void selectConstraint(TransInfo *t)
@ -1062,7 +1061,7 @@ static void setNearestAxis3d(TransInfo *t)
}
if (len[0] <= len[1] && len[0] <= len[2]) {
if (t->modifiers & MOD_CONSTRAINT_PLANE) {
if (t->modifiers & MOD_CONSTRAINT_SELECT_PLANE) {
t->con.mode |= (CON_AXIS1 | CON_AXIS2);
BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" locking %s X axis"), t->spacename);
}
@ -1072,7 +1071,7 @@ static void setNearestAxis3d(TransInfo *t)
}
}
else if (len[1] <= len[0] && len[1] <= len[2]) {
if (t->modifiers & MOD_CONSTRAINT_PLANE) {
if (t->modifiers & MOD_CONSTRAINT_SELECT_PLANE) {
t->con.mode |= (CON_AXIS0 | CON_AXIS2);
BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" locking %s Y axis"), t->spacename);
}
@ -1082,7 +1081,7 @@ static void setNearestAxis3d(TransInfo *t)
}
}
else if (len[2] <= len[1] && len[2] <= len[0]) {
if (t->modifiers & MOD_CONSTRAINT_PLANE) {
if (t->modifiers & MOD_CONSTRAINT_SELECT_PLANE) {
t->con.mode |= (CON_AXIS0 | CON_AXIS1);
BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" locking %s Z axis"), t->spacename);
}

3
source/blender/editors/transform/transform_mode_translate.c
View File

@ -471,6 +471,7 @@ void initTranslation(TransInfo *t)
t->num.unit_type[2] = B_UNIT_NONE;
}
transform_mode_default_modal_orientation_set(t, V3D_ORIENT_GLOBAL);
transform_mode_default_modal_orientation_set(
t, (t->options & CTX_CAMERA) ? V3D_ORIENT_VIEW : V3D_ORIENT_GLOBAL);
}
/** \} */