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

-reimplement OB_Surf support for curves

Browse Source
This commit is contained in:
Joseph Gilbert
2004-01-16 01:19:36 +00:00
parent 50ad38cf56
commit fb6133264a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/python/api2_2x/Object.c
View File

@@ -271,7 +271,7 @@ PyObject *M_Object_New(PyObject *self, PyObject *args)
else if (strcmp (str_type, "Lattice") == 0) type = OB_LATTICE; else if (strcmp (str_type, "Lattice") == 0) type = OB_LATTICE;
/* else if (strcmp (str_type, "Mball") == 0) type = OB_MBALL; */ /* else if (strcmp (str_type, "Mball") == 0) type = OB_MBALL; */
else if (strcmp (str_type, "Mesh") == 0) type = OB_MESH; else if (strcmp (str_type, "Mesh") == 0) type = OB_MESH;
/* else if (strcmp (str_type, "Surf") == 0) type = OB_SURF; */ else if (strcmp (str_type, "Surf") == 0) type = OB_SURF;
/* else if (strcmp (str_type, "Wave") == 0) type = OB_WAVE; */ /* else if (strcmp (str_type, "Wave") == 0) type = OB_WAVE; */
else if (strcmp (str_type, "Empty") == 0) type = OB_EMPTY; else if (strcmp (str_type, "Empty") == 0) type = OB_EMPTY;
else else
@@ -741,6 +741,7 @@ static PyObject *Object_getInverseMatrix (BPy_Object *self)
Mat4Invert (inverse->mem, self->object->obmat); Mat4Invert (inverse->mem, self->object->obmat);
return ((PyObject *)inverse); return ((PyObject *)inverse);
} }
static PyObject *Object_getIpo(BPy_Object *self) static PyObject *Object_getIpo(BPy_Object *self)
@@ -1336,20 +1337,16 @@ static PyObject *Object_shareFrom (BPy_Object *self, PyObject *args)
case OB_CAMERA: /* we can probably add the other types, too */ case OB_CAMERA: /* we can probably add the other types, too */
case OB_ARMATURE: case OB_ARMATURE:
case OB_CURVE: case OB_CURVE:
case OB_SURF:
case OB_LATTICE: case OB_LATTICE:
oldid = (ID*) self->object->data; oldid = (ID*) self->object->data;
id = (ID*) object->object->data; id = (ID*) object->object->data;
self->object->data = object->object->data; self->object->data = object->object->data;
//-- balagi 01/14/2004 //if a mesh is shared the self->object material list must be setup properly ! - balagi
/* if ( self->object->type == OB_MESH && id ){
if a mesh is shared the self->object material list must be setup properly !
*/
if ( self->object->type == OB_MESH && id )
{
EXPP_synchronizeMaterialLists(self->object, id); EXPP_synchronizeMaterialLists(self->object, id);
} }
//-- balagi end
id_us_plus (id); id_us_plus (id);
if (oldid) if (oldid)