[Bf-blender-cvs] [8a4a05ae85c] master: Selectoin: Remove armature bone filters

Clément Foucault noreply at git.blender.org
Thu May 30 19:35:39 CEST 2019


Commit: 8a4a05ae85c000832121c8218f3bcee9e9917e1a
Author: Clément Foucault
Date:   Thu May 30 17:54:05 2019 +0200
Branches: master
https://developer.blender.org/rB8a4a05ae85c000832121c8218f3bcee9e9917e1a

Selectoin: Remove armature bone filters

They seems to do nothing as the filtering seems to already be
done at a higher level.

This fixes T65022 Tracking Markers are not selectable

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

M	source/blender/editors/space_view3d/view3d_select.c

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

diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index b3b4910c525..6d741d39aae 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1713,24 +1713,6 @@ static int mixed_bones_object_selectbuffer_extended(ViewContext *vc,
 
   int hits = mixed_bones_object_selectbuffer(vc, buffer, mval, select_filter, do_nearest);
 
-  if (vc->scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK) {
-    const bool is_pose_mode = ((vc->obact && vc->obact->mode & OB_MODE_POSE) ||
-                               (select_filter == VIEW3D_SELECT_FILTER_WPAINT_POSE_MODE_LOCK));
-    struct {
-      uint data[4];
-    } *buffer4 = (void *)buffer;
-    uint j = 0;
-    for (uint i = 0; i < hits; i++) {
-      if (((buffer4[i].data[3] & 0xFFFF0000) != 0) == is_pose_mode) {
-        if (i != j) {
-          buffer4[j] = buffer4[i];
-        }
-        j++;
-      }
-    }
-    hits = j;
-  }
-
   return hits;
 }



More information about the Bf-blender-cvs mailing list