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-09-21 06:03:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-21 06:48:22 +0300
commit7a3474ddfd21742357ac934b31e82bd3bdefbb84 (patch)
tree56b8a1a7b263bb44504ad93ecc62beb2b4ad07dc /source/blender/editors/gizmo_library/gizmo_types
parent3266ebf9e5df19460ce4960e6c7b7f3618611229 (diff)
Gizmo: spin tool XYZ axis toggles
New handle type for initial spin, gives clear differentiation between do & redo (similar to extrude). Some tweaks still required to match T56571.
Diffstat (limited to 'source/blender/editors/gizmo_library/gizmo_types')
-rw-r--r--source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
index a584d72ce1e..6ba85037b8b 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
@@ -133,8 +133,9 @@ static void button2d_draw_intern(
bool is_3d = (gz->parent_gzgroup->type->flag & WM_GIZMOGROUPTYPE_3D) != 0;
-
- if (draw_options & ED_GIZMO_BUTTON_SHOW_HELPLINE) {
+ if ((select == false) &&
+ (draw_options & ED_GIZMO_BUTTON_SHOW_HELPLINE))
+ {
float matrix_final_no_offset[4][4];
WM_gizmo_calc_matrix_final_no_offset(gz, matrix_final_no_offset);
uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);