scripts/startup/bl_ui/space_toolsystem_toolbar.py

@@ -1660,10 +1660,9 @@ class _defs_weight_paint:
         ob = context.active_object
         if (ob and ob.type == 'MESH' and
             (ob.data.use_paint_mask or
-             ob.data.use_paint_mask_vertex)):
+             ob.data.use_paint_mask_vertex or
+             context.pose_object)):
             return VIEW3D_PT_tools_active._tools_select
-        elif context.pose_object:
-            return (_defs_view3d_select.select,)
         return ()
 
     @staticmethod

source/blender/blenkernel/BKE_paint.hh

@@ -199,13 +199,18 @@ void BKE_paint_palette_set(Paint *p, Palette *palette);
 void BKE_paint_curve_clamp_endpoint_add_index(PaintCurve *pc, int add_index);
 
 /**
- * Return true when in vertex/weight/texture paint + face-select mode?
+ * Return true when in vertex/weight/texture paint + face-select mode.
  */
 bool BKE_paint_select_face_test(const Object *ob);
 /**
- * Return true when in vertex/weight paint + vertex-select mode?
+ * Return true when in vertex/weight paint + vertex-select mode.
  */
 bool BKE_paint_select_vert_test(const Object *ob);
+/**
+ * Return true when in weight paint + bone-select mode.
+ */
+bool BKE_paint_select_bone_test(const Object *ob);
+
 /**
  * used to check if selection is possible
  * (when we don't care if its face or vert)

source/blender/blenkernel/intern/paint.cc

@@ -1023,16 +1023,36 @@ bool BKE_palette_from_hash(Main *bmain, GHash *color_table, const char *name, co
 
 bool BKE_paint_select_face_test(const Object *ob)
 {
-  return ((ob != nullptr) && (ob->type == OB_MESH) && (ob->data != nullptr) &&
-          (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_FACE_SEL) &&
-          (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)));
+  if (ob == nullptr || ob->type != OB_MESH ||
+      (ob->mode & (OB_MODE_WEIGHT_PAINT | OB_MODE_VERTEX_PAINT | OB_MODE_TEXTURE_PAINT)) == 0)
+  {
+    return false;
+  }
+
+  Mesh *mesh = static_cast<Mesh *>(ob->data);
+  return mesh->editflag & ME_EDIT_PAINT_FACE_SEL;
 }
 
 bool BKE_paint_select_vert_test(const Object *ob)
 {
-  return ((ob != nullptr) && (ob->type == OB_MESH) && (ob->data != nullptr) &&
-          (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_VERT_SEL) &&
-          (ob->mode & OB_MODE_WEIGHT_PAINT || ob->mode & OB_MODE_VERTEX_PAINT));
+  if (ob == nullptr || ob->type != OB_MESH ||
+      (ob->mode & (OB_MODE_WEIGHT_PAINT | OB_MODE_VERTEX_PAINT)) == 0)
+  {
+    return false;
+  }
+
+  Mesh *mesh = static_cast<Mesh *>(ob->data);
+  return mesh->editflag & ME_EDIT_PAINT_VERT_SEL;
+}
+
+bool BKE_paint_select_bone_test(const Object *ob)
+{
+  if (ob == nullptr || ob->type != OB_MESH || (ob->mode & OB_MODE_WEIGHT_PAINT) == 0) {
+    return false;
+  }
+
+  Mesh *mesh = static_cast<Mesh *>(ob->data);
+  return (mesh->editflag & (ME_EDIT_PAINT_FACE_SEL | ME_EDIT_PAINT_VERT_SEL)) == 0;
 }
 
 bool BKE_paint_select_elem_test(const Object *ob)

source/blender/editors/space_view3d/view3d_select.cc

@@ -468,9 +468,14 @@ static bool view3d_selectable_data(bContext *C)
       }
     }
     else {
-      if ((ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)) &&
-          !BKE_paint_select_elem_test(ob))
-      {
+      if ((ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_TEXTURE_PAINT)) &&
+          !BKE_paint_select_elem_test(ob)) {
+        return false;
+      }
+
+      Object *ob_armature = BKE_object_pose_armature_get(ob);
+      if (ob->mode & OB_MODE_WEIGHT_PAINT && !BKE_paint_select_elem_test(ob) && !ob_armature) {
+
         return false;
       }
     }
@@ -1378,6 +1383,12 @@ static bool view3d_lasso_select(bContext *C,
     else if (BKE_paint_select_vert_test(ob)) {
       changed_multi |= do_lasso_select_paintvert(vc, wm_userdata, mcoords, mcoords_len, sel_op);
     }
+    else if (ob && (ob->mode & OB_MODE_POSE || BKE_paint_select_bone_test(ob))) {
+      changed_multi |= do_lasso_select_pose(vc, mcoords, mcoords_len, sel_op);
+      if (changed_multi) {
+        ED_outliner_select_sync_from_pose_bone_tag(C);
+      }
+    }
     else if (ob &&
              (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) {
       /* pass */
@@ -1385,12 +1396,6 @@ static bool view3d_lasso_select(bContext *C,
     else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
       changed_multi |= PE_lasso_select(C, mcoords, mcoords_len, sel_op) != OPERATOR_CANCELLED;
     }
-    else if (ob && (ob->mode & OB_MODE_POSE)) {
-      changed_multi |= do_lasso_select_pose(vc, mcoords, mcoords_len, sel_op);
-      if (changed_multi) {
-        ED_outliner_select_sync_from_pose_bone_tag(C);
-      }
-    }
     else {
       changed_multi |= do_lasso_select_objects(vc, mcoords, mcoords_len, sel_op);
       if (changed_multi) {
@@ -2911,6 +2916,14 @@ static bool ed_object_select_pick(bContext *C,
       if ((found && select_passthrough) && (basact->flag & BASE_SELECTED)) {
         found = false;
       }
+      else if (BKE_paint_select_bone_test(vc.obact)) {
+        /* pass  */
+
+        /* During weight paint mode, when there are multiple armatures deforming a single mesh,
+         * object_deselect_all_except might switch the active armature away from pose mode, making
+         * selection of bones with the select tools not possible afterwards.
+         * Passing here makes sure armatures stay in pose mode. */
+      }
       else if (found || params->deselect_all) {
         /* Deselect everything. */
         /* `basact` may be nullptr. */
@@ -4353,7 +4366,7 @@ static int view3d_box_select_exec(bContext *C, wmOperator *op)
     else if (vc.obact && vc.obact->mode & OB_MODE_PARTICLE_EDIT) {
       changed_multi = PE_box_select(C, &rect, sel_op);
     }
-    else if (vc.obact && vc.obact->mode & OB_MODE_POSE) {
+    else if (vc.obact && (vc.obact->mode & OB_MODE_POSE || BKE_paint_select_bone_test(vc.obact))) {
       changed_multi = do_pose_box_select(C, &vc, &rect, sel_op);
       if (changed_multi) {
         ED_outliner_select_sync_from_pose_bone_tag(C);
@@ -5307,6 +5320,21 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
     }
     FOREACH_OBJECT_IN_MODE_END;
   }
+  /* Select bones from pose mode armature in weight paint + bone-select mode. */
+  else if (BKE_paint_select_bone_test(obact)) {
+    view3d_operator_needs_opengl(C);
+    BKE_object_update_select_id(CTX_data_main(C));
+
+    ViewContext vc_tmp;
+    FOREACH_OBJECT_IN_MODE_BEGIN (
+        vc.scene, vc.view_layer, vc.v3d, OB_ARMATURE, OB_MODE_POSE, ob_iter) {
+      vc_tmp = vc;
+      vc_tmp.obact = ob_iter;
+      pose_circle_select(&vc_tmp, sel_op, mval, float(radius));
+      ED_outliner_select_sync_from_pose_bone_tag(C);
+    }
+    FOREACH_OBJECT_IN_MODE_END;
+  }
   else if (obact && (obact->mode & OB_MODE_PARTICLE_EDIT)) {
     if (PE_circle_select(C, wm_userdata, sel_op, mval, float(radius))) {
       return OPERATOR_FINISHED;