[Bf-blender-cvs] [044b824c9d4] master: Cleanup: remove unused MBALL_NOSEL flag

[Campbell Barton]

Commit: 044b824c9d4e718391fcb69ac226b61a4638c42a
Author: Campbell Barton
Date:   Wed Jun 10 23:01:26 2020 +1000
Branches: master
https://developer.blender.org/rB044b824c9d4e718391fcb69ac226b61a4638c42a

Cleanup: remove unused MBALL_NOSEL flag

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

M	source/blender/editors/include/ED_mball.h
M	source/blender/editors/metaball/mball_edit.c
M	source/blender/editors/space_view3d/view3d_select.c

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

diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h
index 4ecf97108e8..938d1059f90 100644
--- a/source/blender/editors/include/ED_mball.h
+++ b/source/blender/editors/include/ED_mball.h
@@ -54,12 +54,10 @@ void ED_mball_editmball_load(struct Object *obedit);
 /* editmball_undo.c */
 void ED_mball_undosys_type(struct UndoType *ut);
 
-#define MBALLSEL_STIFF (1 << 29)
-#define MBALLSEL_RADIUS (1 << 30)
+#define MBALLSEL_STIFF (1u << 30)
+#define MBALLSEL_RADIUS (1u << 31)
 #define MBALLSEL_ANY (MBALLSEL_STIFF | MBALLSEL_RADIUS)
 
-#define MBALL_NOSEL (1u << 31u)
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index 9386c466f95..a25175510cd 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -734,9 +734,6 @@ bool ED_mball_select_pick(bContext *C, const int mval[2], bool extend, bool dese
           if (hitresult == -1) {
             continue;
           }
-          else if (hitresult & MBALL_NOSEL) {
-            continue;
-          }
 
           const uint hit_object = hitresult & 0xFFFF;
           if (vc.obedit->runtime.select_id != hit_object) {
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 8c60e36a141..1bdb8268c23 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -3001,9 +3001,6 @@ static bool do_meta_box_select(ViewContext *vc, const rcti *rect, const eSelectO
       if (hitresult == -1) {
         continue;
       }
-      else if (hitresult & MBALL_NOSEL) {
-        continue;
-      }
 
       const uint hit_object = hitresult & 0xFFFF;
       if (vc->obedit->runtime.select_id != hit_object) {