Freestyle: internal switch from double to float in mesh loading and construction of winged edges.

2 files changed, 9 insertions, 7 deletions

diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 5ec8b545b4c..f24d921c791 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -39,7 +39,9 @@ namespace Freestyle {
 void FEdgeXDetector::processShapes(WingedEdge& we)
 {
 	bool progressBarDisplay = false;
+#if 0
 	Vec3r Min, Max;
+#endif
 	vector<WShape*> wshapes = we.getWShapes();
 	WXShape *wxs;
 
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index b5d73640c11..139502e8d5e 100644
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -632,18 +632,18 @@ FEdge *ViewEdgeXBuilder::BuildSharpFEdge(FEdge *feprevious, const OWXEdge& iwe)
 {
 	SVertex *va, *vb;
 	FEdgeSharp *fe;
-	WXVertex *wxVA, *wxVB;
+	Vec3r vA, vB;
 	if (iwe.order) {
-		wxVA = (WXVertex *)iwe.e->GetaVertex();
-		wxVB = (WXVertex *)iwe.e->GetbVertex();
+		vA = iwe.e->GetaVertex()->GetVertex();
+		vB = iwe.e->GetbVertex()->GetVertex();
 	}
 	else {
-		wxVA = (WXVertex *)iwe.e->GetbVertex();
-		wxVB = (WXVertex *)iwe.e->GetaVertex();
+		vA = iwe.e->GetbVertex()->GetVertex();
+		vB = iwe.e->GetaVertex()->GetVertex();
 	}
 	// Make the 2 SVertex
-	va = MakeSVertex(wxVA->GetVertex(), true);
-	vb = MakeSVertex(wxVB->GetVertex(), true);
+	va = MakeSVertex(vA, true);
+	vb = MakeSVertex(vB, true);
 
 	// get the faces normals and the material indices
 	Vec3r normalA, normalB;