[Bf-blender-cvs] [f2fa737] master: possible fix for crash mentioned in T48887 - Adjust the depth min to the object scale
Germano Cavalcante
noreply at git.blender.org
Wed Jul 20 03:25:26 CEST 2016
Commit: f2fa73786b8f30689c5810224204868775d9c4ec
Author: Germano Cavalcante
Date: Tue Jul 19 22:25:13 2016 -0300
Branches: master
https://developer.blender.org/rBf2fa73786b8f30689c5810224204868775d9c4ec
possible fix for crash mentioned in T48887 - Adjust the depth min to the object scale
===================================================================
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 c3adebe..5b68bdc 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -1244,7 +1244,8 @@ static bool snapDerivedMesh(
* away ray_start values (as returned in case of ortho view3d), see T38358.
*/
len_diff -= local_scale; /* make temp start point a bit away from bbox hit point. */
- madd_v3_v3v3fl(ray_start_local, ray_org_local, ray_normal_local, len_diff + depth_range[0]);
+ madd_v3_v3v3fl(
+ ray_start_local, ray_org_local, ray_normal_local, len_diff + depth_range[0] * local_scale);
local_depth -= len_diff;
}
else {
@@ -1567,7 +1568,8 @@ static bool snapEditMesh(
* (as returned in case of ortho view3d), see T38358.
*/
len_diff -= local_scale; /* make temp start point a bit away from bbox hit point. */
- madd_v3_v3v3fl(ray_start_local, ray_org_local, ray_normal_local, len_diff + depth_range[0]);
+ madd_v3_v3v3fl(
+ ray_start_local, ray_org_local, ray_normal_local, len_diff + depth_range[0] * local_scale);
local_depth -= len_diff;
}
}
More information about the Bf-blender-cvs
mailing list