blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 752 Projects 19 Wiki Activity

Merge branch 'blender-v2.92-release'

This commit is contained in:
Germano Cavalcante 2021-02-04 10:50:43 -03:00
parent 3be5859b21 760a16b88b
commit 4ef8033116
7 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 877a343fed9613d8e02e7fe7181d3bbb628506f2
Subproject commit 6c693b5b0b27468d4fd2d2c47ea023eebbb0dbc0

2
release/scripts/addons

@ -1 +1 @@
Subproject commit a3fa40ec0ba525bc96cbfad49f854a0230b0524e
Subproject commit dfeb905d62ae6d759d8da930f291e73505e6ca67

1
release/scripts/modules/bl_keymap_utils/platform_helpers.py
View File

@ -49,6 +49,7 @@ def keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data_src):
'W',
'ACCENT_GRAVE',
'PERIOD',
'TAB',
}):
if (not item_event.get("alt")) and (not item_event.get("shift")):
return False

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

@ -560,15 +560,15 @@ static void constraints_rotation_impl(TransInfo *t,
switch (mode) {
case CON_AXIS0:
case (CON_AXIS1 | CON_AXIS2):
negate_v3_v3(r_vec, axismtx[0]);
copy_v3_v3(r_vec, axismtx[0]);
break;
case CON_AXIS1:
case (CON_AXIS0 | CON_AXIS2):
negate_v3_v3(r_vec, axismtx[1]);
copy_v3_v3(r_vec, axismtx[1]);
break;
case CON_AXIS2:
case (CON_AXIS0 | CON_AXIS1):
negate_v3_v3(r_vec, axismtx[2]);
copy_v3_v3(r_vec, axismtx[2]);
break;
}
/* don't flip axis if asked to or if num input */

16
source/blender/editors/transform/transform_generics.c
View File

@ -428,7 +428,6 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
BLI_assert(is_zero_v4(t->values_modal_offset));
bool use_orient_axis = false;
bool t_values_set_is_array = false;
if (op && (prop = RNA_struct_find_property(op->ptr, "value")) &&
@ -453,11 +452,6 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
}
}
if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis"))) {
t->orient_axis = RNA_property_enum_get(op->ptr, prop);
use_orient_axis = true;
}
if (op && (prop = RNA_struct_find_property(op->ptr, "constraint_axis"))) {
bool constraint_axis[3] = {false, false, false};
if (t->flag & T_INPUT_IS_VALUES_FINAL) {
@ -466,9 +460,6 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
* orientation is more intuitive in the Redo Panel. */
constraint_axis[0] = constraint_axis[1] = constraint_axis[2] = true;
}
else if (use_orient_axis) {
constraint_axis[t->orient_axis] = true;
}
}
else if (RNA_property_is_set(op->ptr, prop)) {
RNA_property_boolean_get_array(op->ptr, prop, constraint_axis);
@ -497,6 +488,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
short orient_type_set = V3D_ORIENT_GLOBAL;
short orient_type_matrix_set = -1;
bool use_orient_axis = false;
if ((t->spacetype == SPACE_VIEW3D) && (t->region->regiontype == RGN_TYPE_WINDOW)) {
TransformOrientationSlot *orient_slot = &t->scene->orientation_slots[SCE_ORIENT_DEFAULT];
orient_type_scene = orient_slot->type;
@ -508,6 +501,11 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
short orient_type_default = orient_type_scene;
if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis"))) {
t->orient_axis = RNA_property_enum_get(op->ptr, prop);
use_orient_axis = true;
}
if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis_ortho"))) {
t->orient_axis_ortho = RNA_property_enum_get(op->ptr, prop);
}

6
source/blender/editors/transform/transform_gizmo_3d.c
View File

@ -1322,16 +1322,16 @@ void drawDial3d(const TransInfo *t)
if (tc->mode & CON_APPLY) {
if (tc->mode & CON_AXIS0) {
axis_idx = MAN_AXIS_ROT_X;
copy_v3_v3(mat_basis[2], t->spacemtx[0]);
negate_v3_v3(mat_basis[2], t->spacemtx[0]);
}
else if (tc->mode & CON_AXIS1) {
axis_idx = MAN_AXIS_ROT_Y;
copy_v3_v3(mat_basis[2], t->spacemtx[1]);
negate_v3_v3(mat_basis[2], t->spacemtx[1]);
}
else {
BLI_assert((tc->mode & CON_AXIS2) != 0);
axis_idx = MAN_AXIS_ROT_Z;
copy_v3_v3(mat_basis[2], t->spacemtx[2]);
negate_v3_v3(mat_basis[2], t->spacemtx[2]);
}
}
else {

2
source/tools

@ -1 +1 @@
Subproject commit d7d7e9d41f7499aa4639f96c843156ff834385ba
Subproject commit dd131bc4f95103efa60ce11cafbf174efd7b3d4e