Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 6 May 2018 14:00:27 +0000 (16:00 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 6 May 2018 14:00:27 +0000 (16:00 +0200)
source/blender/editors/include/ED_transform_snap_object_context.h
source/blender/editors/transform/transform_snap.c
source/blender/editors/transform/transform_snap_object.c

index 3d778527a591d823c9e2c2ef53b85e8d1108da5f..f1d47911cddad221be7f6a5d48a5ac05c1224947 100644 (file)
@@ -117,7 +117,8 @@ bool ED_transform_snap_object_project_view3d_ex(
         const struct SnapObjectParams *params,
         const float mval[2], float *dist_px,
         float *ray_depth,
-        float r_loc[3], float r_no[3], int *r_index);
+        float r_loc[3], float r_no[3], int *r_index,
+        struct Object **r_ob, float r_obmat[4][4]);
 bool ED_transform_snap_object_project_view3d(
         struct SnapObjectContext *sctx,
         const unsigned short snap_to,
index f0cb291925adc29ff1cafaafd3617dd6ef81d5ce..7eff1b33acc291bab5e1dc3e9bf794a0ede97215 100644 (file)
@@ -1203,7 +1203,8 @@ bool snapObjectsTransform(
                    .use_object_edit_cage = (t->flag & T_EDIT) != 0,
                },
                mval, dist_px, NULL,
-               r_loc, r_no, NULL);
+               r_loc, r_no, NULL,
+               NULL, NULL);
 }
 
 
index fb612e8a4ff128a198ad86e350de96c05c83db15..40b714100149d4a4f7afe67ae584940b85b2cf4c 100644 (file)
@@ -2356,7 +2356,8 @@ bool ED_transform_snap_object_project_view3d_ex(
         const struct SnapObjectParams *params,
         const float mval[2], float *dist_px,
         float *ray_depth,
-        float r_loc[3], float r_no[3], int *r_index)
+        float r_loc[3], float r_no[3], int *r_index,
+        Object **r_ob, float r_obmat[4][4])
 {
        float ray_origin[3], ray_start[3], ray_normal[3], depth_range[2], ray_end[3];
 
@@ -2389,7 +2390,7 @@ bool ED_transform_snap_object_project_view3d_ex(
                        sctx,
                        ray_start, ray_normal,
                        params->snap_select, params->use_object_edit_cage,
-                       ray_depth, r_loc, r_no, r_index, NULL, NULL, NULL);
+                       ray_depth, r_loc, r_no, r_index, r_ob, r_obmat, NULL);
        }
        else {
                SnapData snapdata;
@@ -2400,7 +2401,7 @@ bool ED_transform_snap_object_project_view3d_ex(
                return snapObjectsRay(
                        sctx, &snapdata,
                        params->snap_select, params->use_object_edit_cage,
-                       ray_depth, dist_px, r_loc, r_no, NULL, NULL);
+                       ray_depth, dist_px, r_loc, r_no, r_ob, r_obmat);
        }
 }
 
@@ -2418,7 +2419,8 @@ bool ED_transform_snap_object_project_view3d(
                params,
                mval, dist_px,
                ray_depth,
-               r_loc, r_no, NULL);
+               r_loc, r_no, NULL,
+               NULL, NULL);
 }
 
 /**