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

[Antonio Vazquez]

Commit: 5b12f86c84b37bc36191d375212492ffe6e65122
Author: Antonio Vazquez
Date:   Tue May 15 09:09:53 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5b12f86c84b37bc36191d375212492ffe6e65122

Merge branch 'blender2.8' into greasepencil-object

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

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



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

diff --cc source/blender/editors/transform/transform_snap_object.c
index 3c6a26c6124,5df3107e40b..886eb7c66f9
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@@ -1827,22 -1813,16 +1813,21 @@@ static bool snapObject
  			        ob, obmat, use_obedit,
  			        ray_depth, dist_px,
  			        r_loc, r_no);
- 		}
- 		else if (ob->type == OB_EMPTY) {
+ 			break;
+ 
+ 		case OB_EMPTY:
  			retval = snapEmpty(
- 			        snapdata,
- 			        ob, obmat,
+ 			        snapdata, ob, obmat,
  			        ray_depth, dist_px,
  			        r_loc, r_no);
- 		}
- 		else if (ob->type == OB_GPENCIL) {
+ 			break;
 -
++		case OB_GPENCIL:	
 +			retval = snapEmpty(
- 				snapdata,
- 				ob, obmat,
++				snapdata, ob, obmat,
 +				ray_depth, dist_px,
 +				r_loc, r_no);
- 		}
- 		else if (ob->type == OB_CAMERA) {
++			break;
+ 		case OB_CAMERA:
  			retval = snapCamera(
  			        sctx, snapdata, ob, obmat,
  			        ray_depth, dist_px,