diff options
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge/WEdge.cpp')
-rw-r--r-- | source/blender/freestyle/intern/winged_edge/WEdge.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp index 8b9388caa86..3082988bd36 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp @@ -9,6 +9,8 @@ #include "WEdge.h" +#include "BLI_sys_types.h" + namespace Freestyle { /** Temporary structures */ @@ -451,7 +453,7 @@ WShape *WFace::getShape() * * **********************************/ -unsigned WShape::_SceneCurrentId = 0; +uint WShape::_SceneCurrentId = 0; WShape *WShape::duplicate() { @@ -500,7 +502,7 @@ WShape::WShape(WShape &iBrother) for (v = _VertexList.begin(); v != vend; ++v) { const vector<WEdge *> &vedgeList = (*v)->GetEdges(); vector<WEdge *> newvedgelist; - unsigned int i; + uint i; for (i = 0; i < vedgeList.size(); i++) { WEdge *current = vedgeList[i]; edgedata *currentvedata = (edgedata *)current->userdata; @@ -536,11 +538,11 @@ WShape::WShape(WShape &iBrother) fend = _FaceList.end(); for (f = _FaceList.begin(); f != fend; ++f) { - unsigned int i; + uint i; const vector<WOEdge *> &oedgeList = (*f)->getEdgeList(); vector<WOEdge *> newoedgelist; - unsigned int n = oedgeList.size(); + uint n = oedgeList.size(); for (i = 0; i < n; i++) { WOEdge *current = oedgeList[i]; oedgedata *currentoedata = (oedgedata *)current->userdata; @@ -585,7 +587,7 @@ WShape::WShape(WShape &iBrother) WFace *WShape::MakeFace(vector<WVertex *> &iVertexList, vector<bool> &iFaceEdgeMarksList, - unsigned iMaterial) + uint iMaterial) { // allocate the new face WFace *face = instanciateFace(); @@ -601,7 +603,7 @@ WFace *WShape::MakeFace(vector<WVertex *> &iVertexList, vector<Vec3f> &iNormalsList, vector<Vec2f> &iTexCoordsList, vector<bool> &iFaceEdgeMarksList, - unsigned iMaterial) + uint iMaterial) { // allocate the new face WFace *face = MakeFace(iVertexList, iFaceEdgeMarksList, iMaterial); @@ -620,7 +622,7 @@ WFace *WShape::MakeFace(vector<WVertex *> &iVertexList, WFace *WShape::MakeFace(vector<WVertex *> &iVertexList, vector<bool> &iFaceEdgeMarksList, - unsigned iMaterial, + uint iMaterial, WFace *face) { int id = _FaceList.size(); |