archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

=bmesh= merge from trunk at r36153

Browse Source
This commit is contained in:
Joseph Eagar
2011-04-15 01:19:13 +00:00
parent 0bba684d08 fa63c29775
commit c98148a963
1589 changed files with 83673 additions and 48300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -27,6 +27,11 @@
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/blenkernel/intern/DerivedMesh.c
* \ingroup bke
*/
#include <string.h>
@@ -827,12 +832,12 @@ void weight_to_rgb(float input, float *fr, float *fg, float *fb)
*fg= blend;
*fb= blend*(1.0f-((input-0.25f)*4.0f));
}
else if (input<=0.75){ // green->yellow
else if (input <= 0.75f){ // green->yellow
*fr= blend * ((input-0.50f)*4.0f);
*fg= blend;
*fb= 0.0f;
}
else if (input<=1.0){ // yellow->red
else if (input <= 1.0f){ // yellow->red
*fr= blend;
*fg= blend * (1.0f-((input-0.75f)*4.0f));
*fb= 0.0f;
@@ -1840,11 +1845,9 @@ static void GetNormal(const SMikkTSpaceContext * pContext, float fNorm[], const
}
else
{
int i=0;
short * no = pMesh->mvert[indices[vert_index]].no;
for(i=0; i<3; i++)
fNorm[i]=no[i]/32767.0f;
normalize_v3(fNorm);
short *no = pMesh->mvert[indices[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)