[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40148] trunk/blender/source: - fix for mesh_get_mapped_verts_nors copying short normals to floats without scaling .

[Campbell Barton]

Revision: 40148
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40148
Author:   campbellbarton
Date:     2011-09-12 04:29:35 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
- 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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-09-12 04:14:12 UTC (rev 40147)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-09-12 04:29:35 UTC (rev 40148)
@@ -2517,13 +2517,13 @@
 	/* 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);
 	}
 }
 

Modified: trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp	2011-09-12 04:14:12 UTC (rev 40147)
+++ trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp	2011-09-12 04:29:35 UTC (rev 40148)
@@ -316,8 +316,8 @@
 			/* 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);
 			}
 		}