diff options
Diffstat (limited to 'source/gameengine/Converter/BL_MeshDeformer.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_MeshDeformer.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/source/gameengine/Converter/BL_MeshDeformer.cpp b/source/gameengine/Converter/BL_MeshDeformer.cpp index 911ff245ab4..b8002d05f18 100644 --- a/source/gameengine/Converter/BL_MeshDeformer.cpp +++ b/source/gameengine/Converter/BL_MeshDeformer.cpp @@ -30,10 +30,11 @@ * \ingroup bgeconv */ -#ifdef _MSC_VER - /* This warning tells us about truncation of __long__ stl-generated names. - * It can occasionally cause DevStudio to have internal compiler warnings. */ -# pragma warning( disable:4786 ) + +#if defined(WIN32) && !defined(FREE_WINDOWS) +// This warning tells us about truncation of __long__ stl-generated names. +// It can occasionally cause DevStudio to have internal compiler warnings. +#pragma warning( disable : 4786 ) #endif #include "RAS_IPolygonMaterial.h" @@ -154,27 +155,27 @@ void BL_MeshDeformer::RecalcNormals() v4 = &it.vertex[it.index[i+3]]; co4 = m_transverts[v4->getOrigIndex()]; - n1[0] = co1[0] - co3[0]; - n1[1] = co1[1] - co3[1]; - n1[2] = co1[2] - co3[2]; + n1[0]= co1[0]-co3[0]; + n1[1]= co1[1]-co3[1]; + n1[2]= co1[2]-co3[2]; - n2[0] = co2[0] - co4[0]; - n2[1] = co2[1] - co4[1]; - n2[2] = co2[2] - co4[2]; + n2[0]= co2[0]-co4[0]; + n2[1]= co2[1]-co4[1]; + n2[2]= co2[2]-co4[2]; } else { - n1[0] = co1[0] - co2[0]; - n2[0] = co2[0] - co3[0]; - n1[1] = co1[1] - co2[1]; + n1[0]= co1[0]-co2[0]; + n2[0]= co2[0]-co3[0]; + n1[1]= co1[1]-co2[1]; - n2[1] = co2[1] - co3[1]; - n1[2] = co1[2] - co2[2]; - n2[2] = co2[2] - co3[2]; + n2[1]= co2[1]-co3[1]; + n1[2]= co1[2]-co2[2]; + n2[2]= co2[2]-co3[2]; } - fnor[0] = n1[1] * n2[2] - n1[2] * n2[1]; - fnor[1] = n1[2] * n2[0] - n1[0] * n2[2]; - fnor[2] = n1[0] * n2[1] - n1[1] * n2[0]; + fnor[0]= n1[1]*n2[2] - n1[2]*n2[1]; + fnor[1]= n1[2]*n2[0] - n1[0]*n2[2]; + fnor[2]= n1[0]*n2[1] - n1[1]*n2[0]; normalize_v3(fnor); /* add to vertices for smooth normals */ |