diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 16:01:14 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 16:01:14 +0400 |
commit | bdc13c04de345b890298ce64e2e130a0769639f9 (patch) | |
tree | 614006432e3c516b1d782575df807043065afb4b /source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp | |
parent | 9e93fc1e8acacb99b4b7638590ca4f1491e8b587 (diff) |
Fix for a compilation error with GCC 4.6 (Linux and MinGW32).
Problem report by Bastien Montagne, thanks!
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp')
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 82a50d96e90..22031978263 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -238,6 +238,12 @@ void BlenderFileLoader::addTriangle(struct LoaderState *ls, float v1[3], float v *ls->pm++ = marks; } +struct detri_t { + unsigned viA, viB, viP; // 0 <= viA, viB, viP < viSize + Vec3r v; + unsigned n; +}; + void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) { ObjectRen *obr = obi->obr; @@ -493,11 +499,6 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) // Only those degenerate triangles in the second form are resolved here // by adding a small offset to P, whereas those in the first form are // addressed later in WShape::MakeFace(). - typedef struct { - unsigned viA, viB, viP; // 0 <= viA, viB, viP < viSize - Vec3r v; - unsigned n; - } detri_t; vector<detri_t> detriList; Vec3r zero(0.0, 0.0, 0.0); unsigned vi0, vi1, vi2; |