[Bf-blender-cvs] [1919eb7c9bf] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 1919eb7c9bfdd3d311a182f5b9ba4ae9155d5848
Author: Antonio Vazquez
Date:   Wed May 16 17:38:05 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1919eb7c9bfdd3d311a182f5b9ba4ae9155d5848

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/transform/transform_snap_object.c
index 19b36d53d30,287f3957895..d29d30ceecb
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@@ -1816,15 -1989,10 +1989,15 @@@ static bool snapObject
  		case OB_EMPTY:
  			retval = snapEmpty(
  			        snapdata, ob, obmat,
- 			        ray_depth, dist_px,
- 			        r_loc, r_no);
+ 			        dist_px,
+ 			        r_loc, r_no, r_index);
  			break;
 -
 +		case OB_GPENCIL:	
 +			retval = snapEmpty(
 +				snapdata, ob, obmat,
 +				ray_depth, dist_px,
 +				r_loc, r_no);
 +			break;
  		case OB_CAMERA:
  			retval = snapCamera(
  			        sctx, snapdata, ob, obmat,