[Bf-blender-cvs] [9186b9a] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 9186b9ae4806f4bbc1a14417c408e844f8e8cc1a
Author: Campbell Barton
Date:   Mon Jul 18 19:25:44 2016 +1000
Branches: blender2.8
https://developer.blender.org/rB9186b9ae4806f4bbc1a14417c408e844f8e8cc1a

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 978f1ac,2e06652..9b9b80a
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -332,17 -332,20 +331,17 @@@ bool id_make_local(Main *bmain, ID *id
  		case ID_GR:
  			return false; /* not implemented */
  		case ID_AR:
- 			if (!test) BKE_armature_make_local(bmain, (bArmature *)id);
+ 			if (!test) BKE_armature_make_local(bmain, (bArmature *)id, force_local);
  			return true;
  		case ID_AC:
- 			if (!test) BKE_action_make_local(bmain, (bAction *)id);
+ 			if (!test) BKE_action_make_local(bmain, (bAction *)id, force_local);
  			return true;
  		case ID_NT:
- 			if (!test) ntreeMakeLocal(bmain, (bNodeTree *)id, true);
+ 			if (!test) ntreeMakeLocal(bmain, (bNodeTree *)id, true, force_local);
  			return true;
  		case ID_BR:
- 			if (!test) BKE_brush_make_local(bmain, (Brush *)id);
+ 			if (!test) BKE_brush_make_local(bmain, (Brush *)id, force_local);
  			return true;
 -		case ID_PA:
 -			if (!test) BKE_particlesettings_make_local(bmain, (ParticleSettings *)id, force_local);
 -			return true;
  		case ID_WM:
  			return false; /* can't be linked */
  		case ID_GD:
diff --cc source/blender/editors/space_view3d/view3d_edit.c
index 2b0bd76,b117a5e..83fde34
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -3075,7 -3076,12 +3075,9 @@@ static int viewselected_exec(bContext *
  	else if (BKE_paint_select_face_test(ob)) {
  		ok = paintface_minmax(ob, min, max);
  	}
- 	else if (ob && (ob->mode & (OB_MODE_SCULPT | OB_MODE_TEXTURE_PAINT))) {
 -	else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
 -		ok = PE_minmax(scene, min, max);
 -	}
+ 	else if (ob &&
+ 	         (ob->mode & (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)))
+ 	{
  		BKE_paint_stroke_get_average(scene, ob, min);
  		copy_v3_v3(max, min);
  		ok = true;
diff --cc source/blender/editors/transform/transform_snap_object.c
index ed6d49d,c3adebe..724eba1
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@@ -1451,17 -1862,25 +1862,9 @@@ static bool snapObjectsRay
  {
  	bool retval = false;
  
- 	float dvec[3];
- 	sub_v3_v3v3(dvec, ray_start, ray_origin);
- 
- 	const float ray_depth_range[2] = {
- 		dot_v3v3(dvec, ray_normal),
- 		*ray_depth,
- 	};
- 
  	unsigned int ob_index = 0;
  	Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL;
 -
 -	/* Need an exception for particle edit because the base is flagged with BA_HAS_RECALC_DATA
 -	 * which makes the loop skip it, even the derived mesh will never change
 -	 *
 -	 * To solve that problem, we do it first as an exception.
 -	 * */
  	Base *base_act = sctx->scene->basact;
 -	if (base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT) {
 -		Object *ob = base_act->object;
 -
 -		retval |= snapObject(
 -		        sctx, ob, ob->obmat, ob_index++,
 -		        false, snap_to, mval,
 -		        ray_origin, ray_start, ray_normal, depth_range,
 -		        ray_depth, dist_px,
 -		        r_loc, r_no, r_index, r_ob, r_obmat, r_hit_list);
 -	}
  
  	bool ignore_object_selected = false, ignore_object_active = false;
  	switch (snap_select) {