griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- remove extverts argument from vertexnormals_mesh

Browse Source 
- changed new_NMesh_internal to not take extverts argument
This commit is contained in:
Daniel Dunbar
2005-07-17 18:22:23 +00:00
parent 61fe766897
commit 3d155330e1
3 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/include/BIF_meshtools.h
View File

@@ -38,7 +38,7 @@ extern void join_mesh(void);
extern void fasterdraw(void);
extern void slowerdraw(void);
extern void vertexnormals_mesh(Mesh *me, float *extverts);
extern void vertexnormals_mesh(Mesh *me);
extern void sort_faces(void);

20
source/blender/python/api2_2x/NMesh.c
View File

@@ -43,8 +43,8 @@
#include "BDR_editface.h" /* make_tfaces */
#include "BIF_editdeform.h"
#include "BIF_editkey.h" /* insert_meshkey */
#include "BIF_editmesh.h" /* vertexnormals_mesh() : still needed???*/
#include "BIF_meshtools.h" /* current loc of vertexnormals_mesh() */
#include "BIF_editmesh.h"
#include "BIF_meshtools.h"
#include "BIF_space.h"
#include "BKE_deform.h"
#include "BKE_mesh.h"
@@ -1310,7 +1310,7 @@ static PyObject *NMesh_update( PyObject *self, PyObject *a, PyObject *kwd )
}
if( recalc_normals )
vertexnormals_mesh( mesh, 0 );
vertexnormals_mesh( mesh );
mesh_update( mesh );
@@ -1976,7 +1976,7 @@ static int get_active_faceindex( Mesh * me )
}
static PyObject *new_NMesh_internal( Mesh * oldmesh,
DispListMesh * dlm, float *extverts )
DispListMesh * dlm )
{
BPy_NMesh *me = PyObject_NEW( BPy_NMesh, &NMesh_Type );
me->flags = 0;
@@ -2052,15 +2052,13 @@ static PyObject *new_NMesh_internal( Mesh * oldmesh,
for( i = 0; i < totvert; i++ ) {
MVert *oldmv = &mverts[i];
MSticky *oldst = msticky ? &msticky[i] : NULL;
float *vco = extverts ? &extverts[i * 3] : oldmv->co;
PyList_SetItem( me->verts, i,
( PyObject * ) nmvert_from_data( oldmv,
oldst,
vco,
oldmv->co,
i,
oldmv->
flag ) );
oldmv->flag ) );
}
me->faces = PyList_New( totface );
@@ -2105,7 +2103,7 @@ static PyObject *new_NMesh_internal( Mesh * oldmesh,
PyObject *new_NMesh( Mesh * oldmesh )
{
return new_NMesh_internal( oldmesh, NULL, NULL );
return new_NMesh_internal( oldmesh, NULL );
}
static PyObject *M_NMesh_New( PyObject * self, PyObject * args )
@@ -2183,7 +2181,7 @@ static PyObject *M_NMesh_GetRawFromObject( PyObject * self, PyObject * args )
int needsFree;
DerivedMesh *dm = mesh_get_derived_final(ob, &needsFree);
DispListMesh *dlm = dm->convertToDispListMesh(dm);
nmesh = new_NMesh_internal(ob->data, dlm, NULL);
nmesh = new_NMesh_internal(ob->data, dlm );
if (needsFree)
dm->release(dm);
displistmesh_free(dlm);
@@ -2868,7 +2866,7 @@ static PyObject *M_NMesh_PutRaw( PyObject * self, PyObject * args )
if (mesh->dvert) check_dverts(mesh, old_totvert);
if( recalc_normals )
vertexnormals_mesh( mesh, 0 );
vertexnormals_mesh( mesh );
mesh_update( mesh );

33
source/blender/src/meshtools.c
View File

@@ -39,7 +39,7 @@ void join_mesh(void);
void fasterdraw(void);
void slowerdraw(void);
void vertexnormals_mesh(Mesh *me, float *extverts);
void vertexnormals_mesh(Mesh *me);
void sort_faces(void);
*/
@@ -557,7 +557,7 @@ static int contrpuntnorm(float *n, float *puno) /* dutch: check vertex normal *
return 1;
}
void vertexnormals_mesh(Mesh *me, float *extverts)
void vertexnormals_mesh(Mesh *me)
{
MVert *mvert;
MFace *mface;
@@ -593,18 +593,10 @@ void vertexnormals_mesh(Mesh *me, float *extverts)
if(mface->v3==0) continue;
if(extverts) {
v1= extverts+3*mface->v1;
v2= extverts+3*mface->v2;
v3= extverts+3*mface->v3;
v4= extverts+3*mface->v4;
}
else {
v1= (mvert+mface->v1)->co;
v2= (mvert+mface->v2)->co;
v3= (mvert+mface->v3)->co;
v4= (mvert+mface->v4)->co;
}
v1= (mvert+mface->v1)->co;
v2= (mvert+mface->v2)->co;
v3= (mvert+mface->v3)->co;
v4= (mvert+mface->v4)->co;
VecSubf(n1, v2, v1);
VecSubf(n2, v3, v2);
@@ -683,16 +675,9 @@ void vertexnormals_mesh(Mesh *me, float *extverts)
if(mface->v3==0) continue;
if(extverts) {
v1= extverts+3*mface->v1;
v2= extverts+3*mface->v2;
v3= extverts+3*mface->v3;
}
else {
v1= (mvert+mface->v1)->co;
v2= (mvert+mface->v2)->co;
v3= (mvert+mface->v3)->co;
}
v1= (mvert+mface->v1)->co;
v2= (mvert+mface->v2)->co;
v3= (mvert+mface->v3)->co;
CalcNormFloat(v1, v2, v3, vnor);