archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-05-06 16:00:27 +02:00
parent f28d209591 84474b0171
commit 541258bfa6
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/include/ED_transform_snap_object_context.h
View 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,

3
source/blender/editors/transform/transform_snap.c
View 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);
}

10
source/blender/editors/transform/transform_snap_object.c
View 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);
}
/**