Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-01-30 20:11:10 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-01-30 20:16:07 +0400
commit0cb49286ce45f1b2ce16db0e174170ef2a671dba (patch)
treedb005c428e76c63aea23c3d298a349a3f9051737 /source/blender/blenkernel
parentf54ed9f5e0f036503a8817a65d50d38e9abd43d9 (diff)
Fix T38409: Snapping Bug
Issue partially caused by own errors (glicth in new BKE_boundbox_ray_hit_check() code causing segfault in volume snapping, and we have to treat ortho and persp differently in case of face snapping, because in persp our ray_start might very well already be *inside* the boundbox of the checked object), and partly due to the fact that ED_view3d_win_to_vector() was returning wrong vector (negated one) for ortho views (see previous commit).
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/object.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 019885df935..d8170af30c3 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3155,7 +3155,9 @@ bool BKE_boundbox_ray_hit_check(struct BoundBox *bb, const float ray_start[3], c
(!r_lambda || *r_lambda > lambda))
{
result = true;
- *r_lambda = lambda;
+ if (r_lambda) {
+ *r_lambda = lambda;
+ }
}
}