Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-07-05 20:41:38 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-05 20:41:38 +0300
commit7112e96e0f8854491417d6556b9308a432c9ef32 (patch)
tree29598d881406b318aecbe5daeec211c28006202d /source/blender/editors/space_view3d
parent1bf5cc57bd15cfaf8c26b50a91a8c5fbab26cb68 (diff)
Cleanup: minor changes to last commit
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c17
1 files 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];