From 7112e96e0f8854491417d6556b9308a432c9ef32 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 5 Jul 2018 19:41:38 +0200 Subject: Cleanup: minor changes to last commit --- source/blender/editors/space_view3d/view3d_edit.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 20241b93471..f49d098d1f0 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3730,11 +3730,15 @@ static int view_axis_exec(bContext *C, wmOperator *op) } if (RNA_boolean_get(op->ptr, "relative")) { - float angle_max = FLT_MAX; - int view_closest = -1; - float z_rel[3] = {0.0f, 0.0f, 1.0f}; + float z_rel[3]; - if (viewnum == RV3D_VIEW_TOP) { + if (viewnum == RV3D_VIEW_RIGHT) { + negate_v3_v3(z_rel, rv3d->viewinv[0]); + } + else if (viewnum == RV3D_VIEW_LEFT) { + copy_v3_v3(z_rel, rv3d->viewinv[0]); + } + else if (viewnum == RV3D_VIEW_TOP) { negate_v3_v3(z_rel, rv3d->viewinv[1]); } else if (viewnum == RV3D_VIEW_BOTTOM) { @@ -3752,7 +3756,12 @@ static int view_axis_exec(bContext *C, wmOperator *op) else if (viewnum == RV3D_VIEW_BACK) { copy_v3_v3(z_rel, rv3d->viewinv[2]); } + else { + BLI_assert(0); + } + float angle_max = FLT_MAX; + int view_closest = -1; for (int i = RV3D_VIEW_FRONT; i <= RV3D_VIEW_BOTTOM; i++) { float quat[4]; float mat[3][3]; -- cgit v1.2.3