[Bf-blender-cvs] [5938fd4ccca] master: Fix T61994: crash when box selecting instances

Jacques Lucke noreply at git.blender.org
Thu Feb 28 15:53:44 CET 2019


Commit: 5938fd4cccaa71aca3250ce08b336518a773c59a
Author: Jacques Lucke
Date:   Thu Feb 28 15:53:01 2019 +0100
Branches: master
https://developer.blender.org/rB5938fd4cccaa71aca3250ce08b336518a773c59a

Fix T61994: crash when box selecting instances

Reviewers: brecht

Differential Revision: https://developer.blender.org/D4427

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

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 38436591a67..94162a5e484 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -2553,7 +2553,9 @@ static int do_object_box_select(bContext *C, ViewContext *vc, rcti *rect, const
 	for (const uint *col = vbuffer + 3, *col_end = col + (hits * 4); col < col_end; col += 4) {
 		Bone *bone;
 		Base *base = ED_armature_base_and_bone_from_select_buffer(bases, BLI_array_len(bases), *col, &bone);
-		base->object->id.tag |= LIB_TAG_DOIT;
+		if (base != NULL) {
+			base->object->id.tag |= LIB_TAG_DOIT;
+		}
 	}
 
 	for (Base *base = vc->view_layer->object_bases.first; base && hits; base = base->next) {



More information about the Bf-blender-cvs mailing list