[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36346] trunk/blender/source/blender: remove normalize call in derived mesh GetNormal, its not done anywhere else.

[Campbell Barton]

Revision: 36346
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36346
Author:   campbellbarton
Date:     2011-04-27 04:57:57 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
remove normalize call in derived mesh GetNormal, its not done anywhere else.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/blenlib/intern/math_vector_inline.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-04-27 01:16:24 UTC (rev 36345)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-04-27 04:57:57 UTC (rev 36346)
@@ -2558,7 +2558,6 @@
 	else {
 		const short *no= pMesh->mvert[(&pMesh->mface[face_num].v1)[vert_index]].no;
 		normal_short_to_float_v3(fNorm, no);
-		normalize_v3(fNorm); /* XXX, is this needed */
 	}
 }
 static void SetTSpace(const SMikkTSpaceContext * pContext, const float fvTangent[], const float fSign, const int face_num, const int iVert)

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-04-27 01:16:24 UTC (rev 36345)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-04-27 04:57:57 UTC (rev 36346)
@@ -172,11 +172,7 @@
 static void cdDM_getVertNo(DerivedMesh *dm, int index, float no_r[3])
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
-	short *no = cddm->mvert[index].no;
-
-	no_r[0] = no[0]/32767.f;
-	no_r[1] = no[1]/32767.f;
-	no_r[2] = no[2]/32767.f;
+	normal_short_to_float_v3(no_r, cddm->mvert[index].no);
 }
 
 static ListBase *cdDM_getFaceMap(Object *ob, DerivedMesh *dm)

Modified: trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector_inline.c	2011-04-27 01:16:24 UTC (rev 36345)
+++ trunk/blender/source/blender/blenlib/intern/math_vector_inline.c	2011-04-27 04:57:57 UTC (rev 36346)
@@ -424,14 +424,14 @@
 	return normalize_v3_v3(n, n);
 }
 
-MINLINE void normal_short_to_float_v3(float *out, const short *in)
+MINLINE void normal_short_to_float_v3(float out[3], const short in[3])
 {
 	out[0] = in[0]*(1.0f/32767.0f);
 	out[1] = in[1]*(1.0f/32767.0f);
 	out[2] = in[2]*(1.0f/32767.0f);
 }
 
-MINLINE void normal_float_to_short_v3(short *out, const float *in)
+MINLINE void normal_float_to_short_v3(short out[3], const float in[3])
 {
 	out[0] = (short)(in[0]*32767.0f);
 	out[1] = (short)(in[1]*32767.0f);