[Bf-blender-cvs] [ff34f47] wiggly-widgets: Minor correction to manipulator arrow widgets

Julian Eisel noreply at git.blender.org
Fri Aug 21 12:59:42 CEST 2015


Commit: ff34f47d82950ed9506e3e309b2297d222d449a1
Author: Julian Eisel
Date:   Thu Aug 20 23:17:58 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBff34f47d82950ed9506e3e309b2297d222d449a1

Minor correction to manipulator arrow widgets

To avoid overlapping widgets (would ideally be handled by widget drawing code directly).

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

M	source/blender/editors/transform/manipulator_widget.c

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

diff --git a/source/blender/editors/transform/manipulator_widget.c b/source/blender/editors/transform/manipulator_widget.c
index e41807a..46551a1 100644
--- a/source/blender/editors/transform/manipulator_widget.c
+++ b/source/blender/editors/transform/manipulator_widget.c
@@ -886,7 +886,7 @@ static void manipulator_line_vec(const View3D *v3d, float r_vec[2][3], const sho
 	switch (axis_type) {
 		case MAN_AXES_TRANSLATE:
 			if (v3d->twtype & V3D_MANIP_SCALE) {
-				start[2] = end[2] - ofs;
+				start[2] = end[2] - ofs + 0.025f;
 			}
 			if (v3d->twtype & V3D_MANIP_ROTATE) {
 				end[2] += ofs;
@@ -894,7 +894,7 @@ static void manipulator_line_vec(const View3D *v3d, float r_vec[2][3], const sho
 			break;
 		case MAN_AXES_SCALE:
 			if (v3d->twtype & (V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE)) {
-				end[2] -= ofs;
+				end[2] -= ofs + 0.025f;
 			}
 			break;
 	}




More information about the Bf-blender-cvs mailing list