diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c index 25a05d29b6a5c2c27e3b52ee2bde64dfc7548720..88123c002b68689ee3652ce9087a677615c3771e 100644 --- a/source/blender/python/api2_2x/Object.c +++ b/source/blender/python/api2_2x/Object.c @@ -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, "Mball") == 0) type = OB_MBALL; */ 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, "Empty") == 0) type = OB_EMPTY; else @@ -741,6 +741,7 @@ static PyObject *Object_getInverseMatrix (BPy_Object *self) Mat4Invert (inverse->mem, self->object->obmat); return ((PyObject *)inverse); + } 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_ARMATURE: case OB_CURVE: + case OB_SURF: case OB_LATTICE: oldid = (ID*) self->object->data; id = (ID*) 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 ! - */ - if ( self->object->type == OB_MESH && id ) - { + //if a mesh is shared the self->object material list must be setup properly ! - balagi + if ( self->object->type == OB_MESH && id ){ EXPP_synchronizeMaterialLists(self->object, id); } - //-- balagi end id_us_plus (id); if (oldid)