griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
mano-wii
2017-07-14 17:26:46 -03:00
parent 37242f0a47 8009564503
commit a3d9ef2ea5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/transform/transform_snap_object.c
View File

@@ -785,7 +785,7 @@ struct RaycastObjUserData {
const float *ray_start;
const float *ray_dir;
const float *depth_range;
const unsigned int ob_index;
unsigned int ob_index;
/* read/write args */
float *ray_depth;
/* return args */
@@ -804,7 +804,7 @@ static void raycast_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob,
dt->ret |= raycastObj(
sctx,
dt->ray_orig, dt->ray_start, dt->ray_dir, dt->depth_range,
ob, obmat, dt->ob_index, is_obedit,
ob, obmat, dt->ob_index++, is_obedit,
dt->ray_depth,
dt->r_loc, dt->r_no, dt->r_index,
dt->r_ob, dt->r_obmat,