[Bf-blender-cvs] [7deb38eec69] blender2.8: Gizmo: fix incorrect dial clip scaling

Campbell Barton noreply at git.blender.org
Fri Sep 21 02:18:27 CEST 2018


Commit: 7deb38eec6988dce64a7179ad1b72daa35cb060d
Author: Campbell Barton
Date:   Fri Sep 21 10:29:29 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB7deb38eec6988dce64a7179ad1b72daa35cb060d

Gizmo: fix incorrect dial clip scaling

Failed with obvious error when the dials scale wasn't 1.0

===================================================================

M	source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c

===================================================================

diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
index a6252cd55bd..dfa6c35da28 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
@@ -367,7 +367,7 @@ static void gizmo_dial_draw_select(const bContext *C, wmGizmo *gz, int select_id
 
 		copy_v3_v3(clip_plane, rv3d->viewinv[2]);
 		clip_plane[3] = -dot_v3v3(rv3d->viewinv[2], gz->matrix_basis[3]);
-		clip_plane[3] += DIAL_CLIP_BIAS * gz->scale_final;
+		clip_plane[3] += DIAL_CLIP_BIAS;
 		glEnable(GL_CLIP_DISTANCE0);
 	}
 
@@ -393,7 +393,7 @@ static void gizmo_dial_draw(const bContext *C, wmGizmo *gz)
 
 		copy_v3_v3(clip_plane, rv3d->viewinv[2]);
 		clip_plane[3] = -dot_v3v3(rv3d->viewinv[2], gz->matrix_basis[3]);
-		clip_plane[3] += DIAL_CLIP_BIAS * gz->scale_final;
+		clip_plane[3] += DIAL_CLIP_BIAS;
 
 		glEnable(GL_CLIP_DISTANCE0);
 	}



More information about the Bf-blender-cvs mailing list