- fix for mesh_get_mapped_verts_nors copying short normals to floats without scaling.

- BL_SkinDeformer also did this though for that case its not a problem because the normals are later accumulated anyway.

2 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 7d14ec9dec2..ea4b4d27d2c 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2517,13 +2517,13 @@ static void make_vertexcosnos__mapFunc(void *userData, int index, float *co, flo
 	/* check if we've been here before (normal should not be 0) */
 	if(vec[3] || vec[4] || vec[5]) return;
 
-	VECCOPY(vec, co);
+	copy_v3_v3(vec, co);
 	vec+= 3;
 	if(no_f) {
-		VECCOPY(vec, no_f);
+		copy_v3_v3(vec, no_f);
 	}
 	else {
-		VECCOPY(vec, no_s);
+		normal_short_to_float_v3(vec, no_s);
 	}
 }
 
diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp
index 98afcf877a1..93c65eb38de 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.cpp
+++ b/source/gameengine/Converter/BL_SkinDeformer.cpp
@@ -316,8 +316,8 @@ bool BL_SkinDeformer::UpdateInternal(bool shape_applied)
 			/* duplicate */
 			for (int v =0; v<m_bmesh->totvert; v++)
 			{
-				VECCOPY(m_transverts[v], m_bmesh->mvert[v].co);
-				VECCOPY(m_transnors[v], m_bmesh->mvert[v].no);
+				copy_v3_v3(m_transverts[v], m_bmesh->mvert[v].co);
+				normal_short_to_float_v3(m_transnors[v], m_bmesh->mvert[v].no);
 			}
 		}