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:
authorCampbell Barton <ideasman42@gmail.com>2013-05-01 21:03:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-01 21:03:00 +0400
commite5344adda3c49e737da1411988f6d72bd7446f05 (patch)
tree99dc343479d5cabbcea5b368cb9aca316bfc85d8
parenta1cdccc3d8a82d7ec346e9efa33ff78c426a0820 (diff)
fix error running ED_view3d_project_float_v3_m4 on 2d vec (thanks Sergey for pointing out!), also remove redundant vector copy in knife project.
-rw-r--r--source/blender/editors/mesh/editmesh_knife.c1
-rw-r--r--source/blender/editors/mesh/editmesh_knife_project.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 618ff6ce737..afd151f3c77 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -335,7 +335,6 @@ static KnifeVert *new_knife_vert(KnifeTool_OpData *kcd, const float co[3], const
copy_v3_v3(kfv->co, co);
copy_v3_v3(kfv->cageco, cageco);
- copy_v3_v3(kfv->sco, co);
knife_project_v3(kcd, kfv->co, kfv->sco);
diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c
index 8d385a7e6ff..f473939d0aa 100644
--- a/source/blender/editors/mesh/editmesh_knife_project.c
+++ b/source/blender/editors/mesh/editmesh_knife_project.c
@@ -89,7 +89,7 @@ static LinkNode *knifeproject_poly_from_object(ARegion *ar, Scene *scene, Object
float (*mval)[2] = MEM_mallocN(sizeof(*mval) * (nu->pntsu + is_cyclic), __func__);
for (bp = nu->bp, a = 0; a < nu->pntsu; a++, bp++) {
- ED_view3d_project_float_v3_m4(ar, bp->vec, mval[a], projmat);
+ ED_view3d_project_float_v2_m4(ar, bp->vec, mval[a], projmat);
}
if (is_cyclic) {
copy_v2_v2(mval[a], mval[0]);