archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Missed last commit

Browse Source
This commit is contained in:
Campbell Barton
2019-02-26 21:21:17 +11:00
parent 6ebad22091
commit e5be16175e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3427,6 +3427,7 @@ static void initShear(TransInfo *t)
t->orient_axis_ortho = 1;
if (t->orient_matrix_is_set == false) {
t->orient_matrix_is_set = true;
float *axis = t->orient_matrix[t->orient_axis];
float *axis_ortho = t->orient_matrix[t->orient_axis_ortho];
if (is_zero_v3(axis)) {
@@ -4142,8 +4143,9 @@ static void initRotation(TransInfo *t)
if (t->flag & T_2D_EDIT)
t->flag |= T_NO_CONSTRAINT;
if (t->orient_matrix_is_set == false) {
if ((t->options & CTX_PAINT_CURVE) == 0) {
if ((t->options & CTX_PAINT_CURVE) == 0) {
if (t->orient_matrix_is_set == false) {
t->orient_matrix_is_set = true;
t->orientation.unset = V3D_ORIENT_VIEW;
copy_m3_m4(t->orient_matrix, t->viewinv);
normalize_m3(t->orient_matrix);
@@ -4668,6 +4670,7 @@ static void initNormalRotation(TransInfo *t)
}
if (t->orient_matrix_is_set == false) {
t->orient_matrix_is_set = true;
t->orientation.unset = V3D_ORIENT_VIEW;
copy_m3_m4(t->orient_matrix, t->viewinv);
normalize_m3(t->orient_matrix);

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

@@ -1528,6 +1528,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
{
RNA_property_float_get_array(op->ptr, prop, &t->spacemtx[0][0]);
/* Some transform modes use this to operate on an axis. */
t->orient_matrix_is_set = true;
copy_m3_m3(t->orient_matrix, t->spacemtx);
t->orient_matrix_is_set = true;
t->orientation.user = V3D_ORIENT_CUSTOM_MATRIX;