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

Added DAG flush to NMesh when updating geometry (was needed after zr's latest commits).

Browse Source 
I added that in mesh_update, if anyone has a better idea, feel free to fix it.
This commit is contained in:
Martin Poirier
2005-07-19 05:35:35 +00:00
parent 59a2980611
commit da93fdc9ee
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,18 +33,23 @@
#include "NMesh.h" /*This must come first*/
#include "MEM_guardedalloc.h"
#include "DNA_key_types.h"
#include "DNA_armature_types.h"
#include "DNA_scene_types.h"
#include "DNA_oops_types.h"
#include "DNA_space_types.h"
#include "BDR_editface.h" /* make_tfaces */
#include "BDR_vpaint.h"
#include "BDR_editobject.h"
#include "BIF_editdeform.h"
#include "BIF_editkey.h" /* insert_meshkey */
#include "BIF_meshtools.h" /* current loc of vertexnormals_mesh() */
#include "BIF_editview.h"
#include "BKE_deform.h"
#include "BKE_mesh.h"
#include "BKE_material.h"
@@ -54,9 +59,10 @@
#include "BKE_displist.h"
#include "BKE_DerivedMesh.h"
#include "BKE_object.h"
#include "BLI_arithb.h"
#include "MEM_guardedalloc.h"
#include "BKE_depsgraph.h"
#include "BKE_utildefines.h"
#include "BLI_arithb.h"
#include "blendef.h"
#include "mydevice.h"
#include "Object.h"
@@ -297,9 +303,23 @@ if recalc_normals is True, vertex normals are transformed along with \n\
vertex coordinatess.\n";
void mesh_update( Mesh * mesh )
void mesh_update( Mesh * mesh, Object * ob )
{
edge_drawflags_mesh( mesh );
if (ob) {
DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
}
else {
ob = G.main->object.first;
while (ob) {
if (ob->data == mesh) {
DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
break;
}
ob = ob->id.next;
}
}
}
/*****************************/
@@ -1307,7 +1327,7 @@ static PyObject *NMesh_update( PyObject *self, PyObject *a, PyObject *kwd )
if( recalc_normals )
vertexnormals_mesh( mesh );
mesh_update( mesh );
mesh_update( mesh, nmesh->object );
nmesh_updateMaterials( nmesh );
@@ -2862,7 +2882,7 @@ static PyObject *M_NMesh_PutRaw( PyObject * self, PyObject * args )
if( recalc_normals )
vertexnormals_mesh( mesh );
mesh_update( mesh );
mesh_update( mesh, nmesh->object );
if( !during_script( ) )
EXPP_allqueue( REDRAWVIEW3D, 0 );
@@ -3097,7 +3117,7 @@ Mesh *Mesh_FromPyObject( PyObject * pyobj, Object * ob )
new_id( &( G.main->mesh ), &mesh->id,
PyString_AsString( nmesh->name ) );
mesh_update( mesh );
mesh_update( mesh, nmesh->object );
nmesh_updateMaterials( nmesh );
}

3
source/blender/python/api2_2x/NMesh.h
View File

@@ -143,13 +143,12 @@ Mesh *Mesh_FromPyObject( PyObject * pyobj, Object * ob );
int NMesh_CheckPyObject( PyObject * pyobj );
void mesh_update( Mesh * mesh );
void mesh_update( Mesh * mesh , Object * ob );
PyObject *new_NMesh( Mesh * oldmesh );
Mesh *Mesh_fromNMesh( BPy_NMesh * nmesh , int store_edges );
PyObject *NMesh_assignMaterials_toObject( BPy_NMesh * nmesh, Object * ob );
Material **nmesh_updateMaterials( BPy_NMesh * nmesh );
Material **newMaterialList_fromPyList( PyObject * list );
void mesh_update( Mesh * mesh );
#endif /* EXPP_NMESH_H */