Commit: 56b67cb2b443113f53de805acc67f89cbdbc552b
Author: Tamito Kajiyama
Date: Mon May 19 13:41:14 2014 +0900
https://developer.blender.org/rB56b67cb2b443113f53de805acc67f89cbdbc552b
Freestyle: code cleanup - removed very old commented lines of code.
===================================================================
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.cpp
===================================================================
diff --git
a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index e437b8f..72baea1 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -473,10 +473,6 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen
*obi, int id)
// by the near and far view planes.
int p;
for (p = 0; p < obr->totvlak; ++p) { // we parse the faces of the mesh
-#if 0
- Lib3dsFace *f = &mesh->faceL[p];
- Lib3dsMaterial *mat = NULL;
-#endif
if ((p & 255) == 0)
vlr = obr->vlaknodes[p>>8].vlak;
else
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index 9724866..461df7b 100644
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -302,34 +302,28 @@ WOEdge *WFace::MakeEdge(WVertex *v1, WVertex *v2)
WEdge *we = (*it1);
WOEdge *woea = we->GetaOEdge();
- //if ((*it1)->GetbVertex() == v2) {
if ((woea->GetaVertex() == v1) && (woea->GetbVertex() == v2)) {
// The oriented edge already exists
cerr << "Warning: edge " << v1->GetId() << " - " <<
v2->GetId() << " appears twice, correcting" << endl;
// Adds the edge to the face
- //AddEdge((*it1)->GetaOEdge());
AddEdge(woea);
(*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges() +
1);
//sets these vertices as border:
v1->setBorder(true);
v2->setBorder(true);
- //return (*it1)->GetaOEdge();
return woea;
}
WOEdge *woeb = we->GetbOEdge();
- //if ((*it1)->GetbVertex() == v2)
if (woeb && (woeb->GetaVertex() == v1) && (woeb->GetbVertex()
== v2)) {
// The oriented edge already exists
cerr << "Warning: edge " << v1->GetId() << " - " <<
v2->GetId() << " appears twice, correcting" << endl;
// Adds the edge to the face
- //AddEdge((*it1)->GetaOEdge());
AddEdge(woeb);
(*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges() +
1);
//sets these vertices as border:
v1->setBorder(true);
v2->setBorder(true);
- //return (*it1)->GetaOEdge();
return woeb;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
