griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Freestyle: code cleanup - removed very old commented lines of code.

Browse Source
This commit is contained in:
Tamito Kajiyama
2014-05-19 13:41:14 +09:00
parent 0516071a86
commit 56b67cb2b4
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
View File

@@ -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

6
source/blender/freestyle/intern/winged_edge/WEdge.cpp
View File

@@ -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;
}
}