diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-11 13:44:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-11 13:44:46 +0300 |
commit | 2e3326c1533e992ef7eaa43ed876375af4db5de1 (patch) | |
tree | fe0adcbf314053bd3c079abd4692dea851231aac /source/blender/gpu/intern/gpu_buffers.c | |
parent | 7fe52eedba00a3008d56ad0d689ed27fcf658220 (diff) | |
parent | e4f10565ea6b4a9015bd5a9e81b77d1d549e9b46 (diff) |
Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24330:24483
Diffstat (limited to 'source/blender/gpu/intern/gpu_buffers.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index c3d9e32036c..a6adf8a16a1 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -36,7 +36,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_arithb.h" +#include "BLI_math.h" #include "BLI_ghash.h" #include "DNA_meshdata_types.h" @@ -410,7 +410,7 @@ void GPU_update_buffers(void *buffers_v, MVert *mvert, MVert *v = mvert + vert_indices[i]; VertexBufferFormat *out = vert_data + i; - VecCopyf(out->co, v->co); + copy_v3_v3(out->co, v->co); memcpy(out->no, v->no, sizeof(short) * 3); } glUnmapBufferARB(GL_ARRAY_BUFFER_ARB); @@ -671,9 +671,9 @@ void GPU_buffer_copy_normal( DerivedMesh *dm, float *varray, int *index, int *re VECCOPY(&varray[start+6],&nors[i*3]); } if( mface[i].v4 ) - CalcNormFloat4(mvert[mface[i].v1].co, mvert[mface[i].v2].co, mvert[mface[i].v3].co, mvert[mface[i].v4].co, norm); + normal_quad_v3( norm,mvert[mface[i].v1].co, mvert[mface[i].v2].co, mvert[mface[i].v3].co, mvert[mface[i].v4].co); else - CalcNormFloat(mvert[mface[i].v1].co, mvert[mface[i].v2].co, mvert[mface[i].v3].co, norm); + normal_tri_v3( norm,mvert[mface[i].v1].co, mvert[mface[i].v2].co, mvert[mface[i].v3].co); VECCOPY(&varray[start],norm); VECCOPY(&varray[start+3],norm); VECCOPY(&varray[start+6],norm); |