Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2012-11-05 06:40:10 +0400
committerJoshua Leung <aligorith@gmail.com>2012-11-05 06:40:10 +0400
commitead0005b201f4714974c9113d3ec3f37be5e47c4 (patch)
tree5b27d4885304b9320e8c1760a4181880d6a49e7f /intern
parent2ba840652de83e0f546baaf0e10836bd6571731f (diff)
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]
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_mesh.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index a0feec90203..0e13479a761 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -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 @@ static void mikk_compute_tangents(BL::Mesh b_mesh, BL::MeshTextureFaceLayer b_la
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);