From 70b8a8daf86bcc1d78a46f8aef90597e9befdb60 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 19 Jun 2014 14:19:09 +0900 Subject: Freestyle: removed WOEdge::getVec3r() which in effect was a duplicate of WOEdge::GetVec(). --- source/blender/freestyle/intern/winged_edge/Curvature.cpp | 2 +- source/blender/freestyle/intern/winged_edge/WEdge.cpp | 5 ----- source/blender/freestyle/intern/winged_edge/WEdge.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'source/blender/freestyle/intern/winged_edge') diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 4a910099bff..38941b23357 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -539,7 +539,7 @@ inline static real angle(WOEdge *h) { const Vec3r& n1 = h->GetbFace()->GetNormal(); const Vec3r& n2 = h->GetaFace()->GetNormal(); - const Vec3r v = h->getVec3r(); + const Vec3r v = h->GetVec(); real sine = (n1 ^ n2) * v / v.norm(); if (sine >= 1.0) { return M_PI / 2.0; diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp index 461df7bbf27..de166531d8b 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp @@ -211,11 +211,6 @@ WOEdge *WOEdge::duplicate() return clone; } -Vec3r WOEdge::getVec3r () -{ - return Vec3r(_pbVertex->GetVertex() - _paVertex->GetVertex()); -} - WOEdge *WOEdge::twin () { return GetOwner()->GetOtherOEdge(this); diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index 54461a6e8a6..6699a8113b6 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -525,8 +525,6 @@ public: /*! Retrieves the list of edges in CW order */ inline void RetrieveCWOrderedEdges(vector& oEdges); - /*! returns the vector between the two vertices */ - Vec3r getVec3r (); WOEdge *twin (); WOEdge *getPrevOnFace(); -- cgit v1.2.3