[Bf-blender-cvs] [35290f5d4e] blender2.8: Bring back border selection
Dalai Felinto
noreply at git.blender.org
Mon Feb 27 12:16:35 CET 2017
Commit: 35290f5d4e9c2ed777728ee74c8e3b2c23893249
Author: Dalai Felinto
Date: Mon Feb 27 12:16:27 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB35290f5d4e9c2ed777728ee74c8e3b2c23893249
Bring back border selection
===================================================================
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 66c074d141..0a031555df 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -2023,11 +2023,11 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b
*/
if (hits > 0) { /* no need to loop if there's no hit */
- BaseLegacy *base;
+ Base *base;
col = vbuffer + 3;
- for (base = vc->scene->base.first; base && hits; base = base->next) {
- if (BASE_SELECTABLE(vc->v3d, base)) {
+ for (base = vc->sl->object_bases.first; base && hits; base = base->next) {
+ if (BASE_SELECTABLE_NEW(base)) {
while (base->selcol == (*col & 0xFFFF)) { /* we got an object */
if (*col & 0xFFFF0000) { /* we got a bone */
bone = get_indexed_bone(base->object, *col & ~(BONESEL_ANY));
@@ -2047,7 +2047,7 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b
}
}
else if (!bone_only) {
- ED_base_object_select(base, select ? BA_SELECT : BA_DESELECT);
+ ED_object_base_select(base, select ? BA_SELECT : BA_DESELECT);
}
col += 4; /* next color */
More information about the Bf-blender-cvs
mailing list