[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44617] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp: Fix for a compilation error with GCC 4.6 (Linux and MinGW32).

[Tamito Kajiyama]

Revision: 44617
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44617
Author:   kjym3
Date:     2012-03-03 12:01:14 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
Fix for a compilation error with GCC 4.6 (Linux and MinGW32).
Problem report by Bastien Montagne, thanks!

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp	2012-03-03 11:45:08 UTC (rev 44616)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp	2012-03-03 12:01:14 UTC (rev 44617)
@@ -238,6 +238,12 @@
 	*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 @@
 	// 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;