Commit: 70b8a8daf86bcc1d78a46f8aef90597e9befdb60
Author: Tamito Kajiyama
Date: Thu Jun 19 14:19:09 2014 +0900
https://developer.blender.org/rB70b8a8daf86bcc1d78a46f8aef90597e9befdb60
Freestyle: removed WOEdge::getVec3r() which in effect was a duplicate of
WOEdge::GetVec().
===================================================================
M source/blender/freestyle/intern/winged_edge/Curvature.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.h
===================================================================
diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp
b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
index 4a91009..38941b2 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 461df7b..de16653 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 54461a6..6699a81 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<WEdge*>& oEdges);
- /*! returns the vector between the two vertices */
- Vec3r getVec3r ();
WOEdge *twin ();
WOEdge *getPrevOnFace();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
