[Bf-blender-cvs] [2a82162618] blender2.8: Merge branch 'master' into blender2.8

[Julian Eisel]

Commit: 2a82162618f7b8325a59fe42336b2a5f215e7080
Author: Julian Eisel
Date:   Fri Mar 3 12:55:35 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB2a82162618f7b8325a59fe42336b2a5f215e7080

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/armature/pose_select.c
	source/blender/editors/include/ED_armature.h

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



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

diff --cc source/blender/editors/armature/pose_select.c
index e32726f949,6e32855241..fdc58f6e25
--- a/source/blender/editors/armature/pose_select.c
+++ b/source/blender/editors/armature/pose_select.c
@@@ -132,8 -132,9 +132,9 @@@ void ED_pose_bone_select(Object *ob, bP
  
  /* called from editview.c, for mode-less pose selection */
  /* assumes scene obact and basact is still on old situation */
- int ED_do_pose_selectbuffer(Scene *scene, SceneLayer *sl, Base *base, unsigned int *buffer, short hits,
-                             bool extend, bool deselect, bool toggle, bool do_nearest)
+ bool ED_do_pose_selectbuffer(
 -        Scene *scene, Base *base, const unsigned int *buffer, short hits,
++        Scene *scene, SceneLayer *sl, Base *base, const unsigned int *buffer, short hits,
+         bool extend, bool deselect, bool toggle, bool do_nearest)
  {
  	Object *ob = base->object;
  	Bone *nearBone;
diff --cc source/blender/editors/include/ED_armature.h
index 5451bf2204,6b8943421b..7866bed866
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@@ -138,8 -130,9 +138,9 @@@ void ED_armature_ebone_listbase_temp_cl
  void ED_armature_deselect_all(struct Object *obedit);
  void ED_armature_deselect_all_visible(struct Object *obedit);
  
- int ED_do_pose_selectbuffer(struct Scene *scene, struct SceneLayer *sl, struct Base *base, unsigned int *buffer,
-                             short hits, bool extend, bool deselect, bool toggle, bool do_nearest);
+ bool ED_do_pose_selectbuffer(
 -        struct Scene *scene, struct Base *base, const unsigned int *buffer, short hits,
++        struct Scene *scene, struct SceneLayer *sl, struct Base *base, const unsigned int *buffer, short hits,
+         bool extend, bool deselect, bool toggle, bool do_nearest);
  bool ED_armature_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
  int join_armature_exec(struct bContext *C, struct wmOperator *op);
  struct Bone *get_indexed_bone(struct Object *ob, int index);