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/blenkernel/intern/library_remap.c
Simple merge

diff --cc source/blender/editors/armature/armature_intern.h
Simple merge

diff --cc source/blender/editors/armature/armature_select.c
Simple merge

diff --cc source/blender/editors/armature/pose_select.c
index e32726f949a2f0d7c7983326fd359ff7ed9ef53a,6e3285524110de40faa5319539308bef183dbd59..fdc58f6e2536cbb94eda45747ba01419e36e661d
--- 1/source/blender/editors/armature/pose_select.c
--- 2/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 5451bf22045b6b454109eb9f335103cb33b90575,6b8943421bdd3dd776d752207d3a869da8915a01..7866bed86664ee5f866501d5d8bffee0cb4e2883
--- 1/source/blender/editors/include/ED_armature.h
--- 2/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);

diff --cc source/blender/editors/sculpt_paint/paint_image_proj.c
Simple merge