Commit: e6828a71d7a5c0581c5f404b3ff98a523de998dc
Author: Campbell Barton
Date: Wed Sep 17 00:23:14 2014 +1000
Branches: master
https://developer.blender.org/rBe6828a71d7a5c0581c5f404b3ff98a523de998dc
Fix T41850: Knife fails with mesh behind view
Was using first vertex for depth (which could be anywhere),
now use the view-pivot.
was also copying uninitialized vector into knife_find_closest_* return values
(confused debugging).
===================================================================
M source/blender/editors/mesh/editmesh_knife.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_knife.c
b/source/blender/editors/mesh/editmesh_knife.c
index 07dc1b0..76c41ad 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -469,19 +469,23 @@ static void knife_start_cut(KnifeTool_OpData *kcd)
kcd->prev = kcd->curr;
kcd->curr.is_space = 0; /*TODO: why do we do this? */
- if (kcd->prev.vert == NULL && kcd->prev.edge == NULL &&
is_zero_v3(kcd->prev.cage)) {
- /* Make prevcage a point on the view ray to mouse closest to a
point on model: choose vertex 0 */
+ if (kcd->prev.vert == NULL && kcd->prev.edge == NULL) {
float origin[3], origin_ofs[3];
- BMVert *v0;
+ float ofs_local[3];
+
+ negate_v3_v3(ofs_local, kcd->vc.rv3d->ofs);
+ invert_m4_m4(kcd->ob->imat, kcd->ob->obmat);
+ mul_m4_v3(kcd->ob->imat, ofs_local);
knife_input_ray_segment(kcd, kcd->curr.mval, 1.0f, origin,
origin_ofs);
- v0 = BM_vert_at_index_find(kcd->em->bm, 0);
- if (v0) {
- closest_to_line_v3(kcd->prev.cage, v0->co, origin_ofs,
origin);
- copy_v3_v3(kcd->prev.co, kcd->prev.cage); /*TODO: do we
need this? */
- copy_v3_v3(kcd->curr.cage, kcd->prev.cage);
- copy_v3_v3(kcd->curr.co, kcd->prev.co);
+
+ if (!isect_line_plane_v3(kcd->prev.cage, origin, origin_ofs,
ofs_local, kcd->proj_zaxis)) {
+ zero_v3(kcd->prev.cage);
}
+
+ copy_v3_v3(kcd->prev.co, kcd->prev.cage); /*TODO: do we need
this? */
+ copy_v3_v3(kcd->curr.cage, kcd->prev.cage);
+ copy_v3_v3(kcd->curr.co, kcd->prev.co);
}
}
@@ -1649,10 +1653,6 @@ static KnifeEdge
*knife_find_closest_edge(KnifeTool_OpData *kcd, float p[3], flo
f = knife_find_closest_face(kcd, co, cageco, NULL);
*is_space = !f;
- /* set p to co, in case we don't find anything, means a face cut */
- copy_v3_v3(p, co);
- copy_v3_v3(cagep, cageco);
-
kcd->curr.bmface = f;
if (f) {
@@ -1663,6 +1663,10 @@ static KnifeEdge
*knife_find_closest_edge(KnifeTool_OpData *kcd, float p[3], flo
Ref *ref;
float dis_sq, curdis_sq = FLT_MAX;
+ /* set p to co, in case we don't find anything, means a face
cut */
+ copy_v3_v3(p, co);
+ copy_v3_v3(cagep, cageco);
+
knife_project_v2(kcd, cageco, sco);
/* look through all edges associated with this face */
@@ -1771,9 +1775,6 @@ static KnifeVert
*knife_find_closest_vert(KnifeTool_OpData *kcd, float p[3], flo
f = knife_find_closest_face(kcd, co, cageco, is_space);
- /* set p to co, in case we don't find anything, means a face cut */
- copy_v3_v3(p, co);
- copy_v3_v3(cagep, cageco);
kcd->curr.bmface = f;
if (f) {
@@ -1783,6 +1784,10 @@ static KnifeVert
*knife_find_closest_vert(KnifeTool_OpData *kcd, float p[3], flo
KnifeVert *curv = NULL;
float dis_sq, curdis_sq = FLT_MAX;
+ /* set p to co, in case we don't find anything, means a face
cut */
+ copy_v3_v3(p, co);
+ copy_v3_v3(cagep, cageco);
+
knife_project_v2(kcd, cageco, sco);
lst = knife_get_face_kedges(kcd, f);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
