Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 05:27:53 +0000 (07:27 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 05:27:53 +0000 (07:27 +0200)
1  2 
source/blender/editors/armature/armature_edit.c
source/blender/editors/space_view3d/view3d_select.c

index 71ec7bf700c1a98e1fe8e17099f3d54fbaf128bc,d184081b03a6b7dd60bd7348eb6a13c59fa606bd..c38bcbcd6458355cce589f8aff473021d381a205
@@@ -1899,21 -1911,18 +1899,20 @@@ static int do_meta_box_select
        return OPERATOR_FINISHED;
  }
  
 -static int do_armature_box_select(ViewContext *vc, rcti *rect, bool select, bool extend)
 +static int do_armature_box_select(
 +        const struct EvaluationContext *eval_ctx, ViewContext *vc,
 +        const rcti *rect, bool select, bool extend)
  {
        bArmature *arm = vc->obedit->data;
-       EditBone *ebone;
        int a;
  
        unsigned int buffer[MAXPICKBUF];
        int hits;
  
 -      hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, rect, VIEW3D_SELECT_ALL);
 +      hits = view3d_opengl_select(eval_ctx, vc, buffer, MAXPICKBUF, rect, VIEW3D_SELECT_ALL);
        
        /* clear flag we use to detect point was affected */
-       for (ebone = arm->edbo->first; ebone; ebone = ebone->next)
+       for (EditBone *ebone = arm->edbo->first; ebone; ebone = ebone->next)
                ebone->flag &= ~BONE_DONE;
        
        if (extend == false && select)