[Bf-blender-cvs] [64fd45b1dfe] blender2.8: Merge branch 'master' into blender2.8

[mano-wii]

Commit: 64fd45b1dfe5eceb8c1d2a6f04377ee202da2a3b
Author: mano-wii
Date:   Fri Jul 21 14:20:24 2017 -0300
Branches: blender2.8
https://developer.blender.org/rB64fd45b1dfe5eceb8c1d2a6f04377ee202da2a3b

Merge branch 'master' into blender2.8

# Conflicts:
#	source/blender/editors/transform/transform_snap_object.c

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



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

diff --cc source/blender/editors/transform/transform_snap_object.c
index b750dbb0893,378742c63b8..32ac282eb1d
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@@ -727,8 -709,8 +713,8 @@@ static bool raycastEditMesh
   * \note Duplicate args here are documented at #snapObjectsRay
   */
  static bool raycastObj(
 -        SnapObjectContext *sctx,
 +        const bContext *C, SnapObjectContext *sctx,
-         const float ray_orig[3], const float ray_start[3], const float ray_dir[3], const float depth_range[2],
+         const float ray_orig[3], const float ray_start[3], const float ray_dir[3],
          Object *ob, float obmat[4][4], const unsigned int ob_index,
          bool use_obedit,
          /* read/write args */
@@@ -808,8 -786,8 +793,8 @@@ static void raycast_obj_cb(const bConte
  {
  	struct RaycastObjUserData *dt = data;
  	dt->ret |= raycastObj(
 -	        sctx,
 +	        C, sctx,
- 	        dt->ray_orig, dt->ray_start, dt->ray_dir, dt->depth_range,
+ 	        dt->ray_orig, dt->ray_start, dt->ray_dir,
  	        ob, obmat, dt->ob_index++, is_obedit,
  	        dt->ray_depth,
  	        dt->r_loc, dt->r_no, dt->r_index,
@@@ -847,8 -825,8 +832,8 @@@
   *
   */
  static bool raycastObjects(
 -        SnapObjectContext *sctx,
 +        const bContext *C, SnapObjectContext *sctx,
-         const float ray_orig[3], const float ray_start[3], const float ray_dir[3], const float depth_range[2],
+         const float ray_orig[3], const float ray_start[3], const float ray_dir[3],
          const SnapSelect snap_select, const bool use_object_edit_cage,
          /* read/write args */
          float *ray_depth,
@@@ -2232,11 -2205,9 +2216,9 @@@ bool ED_transform_snap_object_project_r
          float r_loc[3], float r_no[3], int *r_index,
          Object **r_ob, float r_obmat[4][4])
  {
- 	const float depth_range[2] = {0.0f, FLT_MAX};
- 
  	return raycastObjects(
 -	        sctx,
 +	        C, sctx,
- 	        ray_start, ray_start, ray_normal, depth_range,
+ 	        ray_start, ray_start, ray_normal,
  	        params->snap_select, params->use_object_edit_cage,
  	        ray_depth, r_loc, r_no, r_index, r_ob, r_obmat, NULL);
  }
@@@ -2265,8 -2235,8 +2246,8 @@@ bool ED_transform_snap_object_project_r
  #endif
  
  	bool retval = raycastObjects(
 -	        sctx,
 +	        C, sctx,
- 	        ray_start, ray_start, ray_normal, depth_range,
+ 	        ray_start, ray_start, ray_normal,
  	        params->snap_select, params->use_object_edit_cage,
  	        &ray_depth, NULL, NULL, NULL, NULL, NULL,
  	        r_hit_list);
@@@ -2448,8 -2418,8 +2429,8 @@@ bool ED_transform_snap_object_project_v
  
  	if (snap_to == SCE_SNAP_MODE_FACE) {
  		return raycastObjects(
 -		        sctx,
 +		        C, sctx,
- 		        ray_origin, ray_start, ray_normal, depth_range,
+ 		        ray_origin, ray_start, ray_normal,
  		        params->snap_select, params->use_object_edit_cage,
  		        ray_depth, r_loc, r_no, r_index, NULL, NULL, NULL);
  	}