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

added mesh_create_derived_view(ob) to DerivedMesh.c

Browse Source 
exactly the same as mesh_create_derived_render(ob) except it uses the view modifier settings.

Added an optional arg to getFromObject to 'render' so you can choose to get the mesh displayed in the 3d view or generate one with render settings.
Solved bug 4612 getFromObject now works with soft body meshes (error was caused by getting the derived mesh from a copy of the object)

removed workaround for softbody bug in object_apply_def.py
This commit is contained in:
Campbell Barton
2006-09-17 05:15:56 +00:00
parent e472a3d852
commit d89240ba12
5 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/python/api2_2x/Mesh.c
View File

@@ -5591,9 +5591,9 @@ static PyObject *Mesh_getFromObject( BPy_Mesh * self, PyObject * args )
DispListMesh *dlm;
DerivedMesh *dm;
Object *tmpobj = NULL;
int cage = 0, i;
int cage = 0, render = 0, i;
if( !PyArg_ParseTuple( args, "s|i", &name, &cage ) )
if( !PyArg_ParseTuple( args, "s|i", &name, &cage, &render ) )
return EXPP_ReturnPyObjError( PyExc_TypeError,
"expected string and optional integer arguments" );
@@ -5664,34 +5664,25 @@ static PyObject *Mesh_getFromObject( BPy_Mesh * self, PyObject * args )
break;
case OB_MESH:
/* copies object and modifiers (but not the data) */
tmpobj= copy_object( ob );
tmpmesh = tmpobj->data;
tmpmesh->id.us--;
if (cage) {
/* copies the data */
tmpobj->data = copy_mesh( tmpmesh );
G.totmesh++;
tmpmesh = tmpobj->data;
tmpmesh = copy_mesh( ob->data );
/* if not getting the original caged mesh, get final derived mesh */
} else {
/* Make a dummy mesh, saves copying */
tmpmesh = add_mesh( );
G.totmesh++;
/* Write the display mesh into the dummy mesh */
dm = mesh_create_derived_render( tmpobj );
if (render)
dm = mesh_create_derived_render( ob );
else
dm = mesh_create_derived_view( ob );
dlm = dm->convertToDispListMesh( dm, 0 );
tmpmesh = add_mesh( );
displistmesh_to_mesh( dlm, tmpmesh );
dm->release( dm );
}
/* take control of mesh before object is freed */
tmpobj->data = NULL;
free_libblock_us( &G.main->object, tmpobj );
break;
default:
return EXPP_ReturnPyObjError( PyExc_AttributeError,