[Bf-blender-cvs] [bc109be34c7] master: Object Mode: don't use origin axis helpers for selection

Campbell Barton noreply at git.blender.org
Thu Sep 12 22:40:45 CEST 2019


Commit: bc109be34c711e06bd59cf916a0446d1978ca9f3
Author: Campbell Barton
Date:   Fri Sep 13 06:34:36 2019 +1000
Branches: master
https://developer.blender.org/rBbc109be34c711e06bd59cf916a0446d1978ca9f3

Object Mode: don't use origin axis helpers for selection

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

M	source/blender/draw/modes/object_mode.c

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

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 37b271e4778..2b87e04b6b4 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -3690,9 +3690,11 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
   if (draw_ctx->object_mode == OB_MODE_OBJECT) {
     if (scene->toolsettings->transform_flag & SCE_XFORM_DATA_ORIGIN) {
       if (ob->base_flag & BASE_SELECTED) {
-        const float color[4] = {0.75, 0.75, 0.75, 0.5};
-        float axes_size = 1.0f;
-        DRW_buffer_add_entry(sgl->origin_xform, color, &axes_size, ob->obmat);
+        if (!DRW_state_is_select()) {
+          const float color[4] = {0.75, 0.75, 0.75, 0.5};
+          float axes_size = 1.0f;
+          DRW_buffer_add_entry(sgl->origin_xform, color, &axes_size, ob->obmat);
+        }
       }
     }
   }



More information about the Bf-blender-cvs mailing list