[Bf-blender-cvs] [743f931] master: Fix T48846: Ruler/Protractor crash in ortho mode
Campbell Barton
noreply at git.blender.org
Thu Jul 14 03:10:00 CEST 2016
Commit: 743f9315842489e94e778607742322a01995d365
Author: Campbell Barton
Date: Thu Jul 14 11:06:40 2016 +1000
Branches: master
https://developer.blender.org/rB743f9315842489e94e778607742322a01995d365
Fix T48846: Ruler/Protractor crash in ortho mode
Error in recent snap changes.
===================================================================
M source/blender/editors/transform/transform_snap_object.c
===================================================================
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 2e7e9e0..7aed7f9 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -2107,10 +2107,11 @@ bool ED_transform_snap_object_project_ray_ex(
float r_loc[3], float r_no[3], int *r_index,
Object **r_ob, float r_obmat[4][4])
{
+ const float depth_range[2] = {0.0f, FLT_MAX};
return snapObjectsRay(
sctx,
snap_to, params->snap_select, params->use_object_edit_cage, NULL,
- ray_start, ray_start, ray_normal, NULL,
+ ray_start, ray_start, ray_normal, depth_range,
ray_depth, NULL,
r_loc, r_no, r_index, r_ob, r_obmat, NULL);
}
@@ -2130,6 +2131,7 @@ bool ED_transform_snap_object_project_ray_all(
float ray_depth, bool sort,
ListBase *r_hit_list)
{
+ const float depth_range[2] = {0.0f, FLT_MAX};
if (ray_depth == -1.0f) {
ray_depth = BVH_RAYCAST_DIST_MAX;
}
@@ -2141,7 +2143,7 @@ bool ED_transform_snap_object_project_ray_all(
bool retval = snapObjectsRay(
sctx,
snap_to, params->snap_select, params->use_object_edit_cage, NULL,
- ray_start, ray_start, ray_normal, NULL,
+ ray_start, ray_start, ray_normal, depth_range,
&ray_depth, NULL,
NULL, NULL, NULL, NULL, NULL,
r_hit_list);
More information about the Bf-blender-cvs
mailing list