[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51878] trunk/blender/intern/cycles/ blender/blender_mesh.cpp: Compile fix on Mingw:

[Joshua Leung]

Revision: 51878
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51878
Author:   aligorith
Date:     2012-11-05 02:40:10 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Compile fix on Mingw:

"interface" appeared to be a shadowed var (or even a macro/define elsewhere)
which was causing errors like:
intern\cycles\blender\blender_mesh.cpp:124:23: error: multiple types in one
declaration
intern\cycles\blender\blender_mesh.cpp:124:23: error: declaration does not
declare anything [-fpermissive]

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_mesh.cpp

Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp	2012-11-04 23:52:26 UTC (rev 51877)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp	2012-11-05 02:40:10 UTC (rev 51878)
@@ -16,6 +16,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+ 
 #include "mesh.h"
 #include "object.h"
 #include "scene.h"
@@ -121,20 +122,20 @@
 	MikkUserData userdata(b_mesh, b_layer, nverts.size());
 
 	/* setup interface */
-	SMikkTSpaceInterface interface;
-	memset(&interface, 0, sizeof(interface));
-	interface.m_getNumFaces = mikk_get_num_faces;
-	interface.m_getNumVerticesOfFace = mikk_get_num_verts_of_face;
-	interface.m_getPosition = mikk_get_position;
-	interface.m_getTexCoord = mikk_get_texture_coordinate;
-	interface.m_getNormal = mikk_get_normal;
-	interface.m_setTSpaceBasic = mikk_set_tangent_space;
+	SMikkTSpaceInterface sm_interface;
+	memset(&sm_interface, 0, sizeof(sm_interface));
+	sm_interface.m_getNumFaces = mikk_get_num_faces;
+	sm_interface.m_getNumVerticesOfFace = mikk_get_num_verts_of_face;
+	sm_interface.m_getPosition = mikk_get_position;
+	sm_interface.m_getTexCoord = mikk_get_texture_coordinate;
+	sm_interface.m_getNormal = mikk_get_normal;
+	sm_interface.m_setTSpaceBasic = mikk_set_tangent_space;
 
 	/* setup context */
 	SMikkTSpaceContext context;
 	memset(&context, 0, sizeof(context));
 	context.m_pUserData = &userdata;
-	context.m_pInterface = &interface;
+	context.m_pInterface = &sm_interface;
 
 	/* compute tangents */
 	genTangSpaceDefault(&context);