[Bf-blender-cvs] [7112e96e0f8] blender2.8: Cleanup: minor changes to last commit
Campbell Barton
noreply at git.blender.org
Thu Jul 5 19:42:32 CEST 2018
Commit: 7112e96e0f8854491417d6556b9308a432c9ef32
Author: Campbell Barton
Date: Thu Jul 5 19:41:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7112e96e0f8854491417d6556b9308a432c9ef32
Cleanup: minor changes to last commit
===================================================================
M source/blender/editors/space_view3d/view3d_edit.c
===================================================================
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];
More information about the Bf-blender-cvs
mailing list