blender
/
blender
127
395
Fork 566
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

fix T50592: Scene.raycast not working 

Ray_start and ray_normal values were being ignored
This commit is contained in:
Germano Cavalcante 2017-02-04 18:17:15 -03:00
parent a2c469edc2
commit 47caf343c0
Notes: blender-bot 2023-02-14 19:42:05 +01:00 
Referenced by issue blender/blender-addons#50592, scene.ray_cast() return nothing
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1827,6 +1827,9 @@ SnapObjectContext *ED_transform_snap_object_context_create(
sctx->bmain = bmain;
sctx->scene = scene;
sctx->cache.object_map = BLI_ghash_ptr_new(__func__);
sctx->cache.mem_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
return sctx;
}
@ -1841,9 +1844,6 @@ SnapObjectContext *ED_transform_snap_object_context_create_view3d(
sctx->v3d_data.ar = ar;
sctx->v3d_data.v3d = v3d;
sctx->cache.object_map = BLI_ghash_ptr_new(__func__);
sctx->cache.mem_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
return sctx;
}
@ -1875,12 +1875,8 @@ static void snap_object_data_free(void *sod_v)
void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx)
{
if (sctx->cache.object_map) {
BLI_ghash_free(sctx->cache.object_map, NULL, snap_object_data_free);
}
if (sctx->cache.mem_arena) {
BLI_memarena_free(sctx->cache.mem_arena);
}
BLI_ghash_free(sctx->cache.object_map, NULL, snap_object_data_free);
BLI_memarena_free(sctx->cache.mem_arena);
MEM_freeN(sctx);
}
@ -1903,7 +1899,7 @@ bool ED_transform_snap_object_project_ray_ex(
SnapObjectContext *sctx,
const unsigned short snap_to,
const struct SnapObjectParams *params,
const float UNUSED(ray_start[3]), const float UNUSED(ray_normal[3]),
const float ray_start[3], const float ray_normal[3],
float *ray_depth,
float r_loc[3], float r_no[3], int *r_index,
Object **r_ob, float r_obmat[4][4])
@ -1911,7 +1907,9 @@ bool ED_transform_snap_object_project_ray_ex(
const float depth_range[2] = {0.0f, FLT_MAX};
SnapData snapdata;
snap_data_set(&snapdata, sctx->v3d_data.ar, snap_to, VIEW_PROJ_NONE, NULL, r_loc, r_loc, r_no, depth_range);
snap_data_set(
&snapdata, sctx->v3d_data.ar, snap_to, VIEW_PROJ_NONE,
NULL, ray_start, ray_start, ray_normal, depth_range);
return snapObjectsRay(
sctx, &snapdata,