diff --git a/source/blender/python/api2_2x/Draw.c b/source/blender/python/api2_2x/Draw.c index 3434b655280..b99e9444bab 100644 --- a/source/blender/python/api2_2x/Draw.c +++ b/source/blender/python/api2_2x/Draw.c @@ -1,4 +1,5 @@ /* + * $Id$ * * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** * @@ -24,7 +25,7 @@ * * This is a new part of Blender. * - * Contributor(s): Willian P. Germano + * Contributor(s): Willian P. Germano, Campbell Barton * * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ @@ -106,6 +107,7 @@ static PyObject *Method_String (PyObject * self, PyObject * args); static PyObject *Method_GetStringWidth (PyObject * self, PyObject * args); static PyObject *Method_Text (PyObject * self, PyObject * args); static PyObject *Method_PupMenu (PyObject * self, PyObject * args); +/* next two by Campbell: */ static PyObject *Method_PupIntInput (PyObject * self, PyObject * args); static PyObject *Method_PupFloatInput (PyObject * self, PyObject * args); diff --git a/source/blender/python/api2_2x/Image.c b/source/blender/python/api2_2x/Image.c index 82e23c8931a..70fdd99c235 100644 --- a/source/blender/python/api2_2x/Image.c +++ b/source/blender/python/api2_2x/Image.c @@ -1,4 +1,5 @@ /* + * $Id$ * * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** * @@ -17,14 +18,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. * * This is a new part of Blender. * - * Contributor(s): Willian P. Germano + * Contributor(s): Willian P. Germano, Campbell Barton * * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ @@ -33,6 +34,7 @@ #include #include #include +#include #include #include /* for the IB_rect define */ #include "gen_utils.h" @@ -40,10 +42,10 @@ #include "Image.h" /*****************************************************************************/ -/* Python BPy_Image defaults: */ +/* Python BPy_Image defaults: */ /*****************************************************************************/ -#define EXPP_IMAGE_REP 1 -#define EXPP_IMAGE_REP_MIN 1 +#define EXPP_IMAGE_REP 1 +#define EXPP_IMAGE_REP_MIN 1 #define EXPP_IMAGE_REP_MAX 16 @@ -52,17 +54,17 @@ /************************/ /*****************************************************************************/ -/* Python API function prototypes for the Image module. */ +/* Python API function prototypes for the Image module. */ /*****************************************************************************/ static PyObject *M_Image_New (PyObject *self, PyObject *args, - PyObject *keywords); + PyObject *keywords); static PyObject *M_Image_Get (PyObject *self, PyObject *args); static PyObject *M_Image_Load (PyObject *self, PyObject *args); /*****************************************************************************/ -/* The following string definitions are used for documentation strings. */ -/* In Python these will be written to the console when doing a */ -/* Blender.Image.__doc__ */ +/* The following string definitions are used for documentation strings. */ +/* In Python these will be written to the console when doing a */ +/* Blender.Image.__doc__ */ /*****************************************************************************/ static char M_Image_doc[] = "The Blender Image module\n\n"; @@ -80,82 +82,82 @@ static char M_Image_Load_doc[] = returns None if not found.\n"; /*****************************************************************************/ -/* Python method structure definition for Blender.Image module: */ +/* Python method structure definition for Blender.Image module: */ /*****************************************************************************/ struct PyMethodDef M_Image_methods[] = { - {"New",(PyCFunction)M_Image_New, METH_VARARGS|METH_KEYWORDS, - M_Image_New_doc}, - {"Get", M_Image_Get, METH_VARARGS, M_Image_Get_doc}, - {"get", M_Image_Get, METH_VARARGS, M_Image_Get_doc}, - {"Load", M_Image_Load, METH_VARARGS, M_Image_Load_doc}, - {NULL, NULL, 0, NULL} + {"New",(PyCFunction)M_Image_New, METH_VARARGS|METH_KEYWORDS, + M_Image_New_doc}, + {"Get", M_Image_Get, METH_VARARGS, M_Image_Get_doc}, + {"get", M_Image_Get, METH_VARARGS, M_Image_Get_doc}, + {"Load", M_Image_Load, METH_VARARGS, M_Image_Load_doc}, + {NULL, NULL, 0, NULL} }; /*****************************************************************************/ -/* Function: M_Image_New */ -/* Python equivalent: Blender.Image.New */ +/* Function: M_Image_New */ +/* Python equivalent: Blender.Image.New */ /*****************************************************************************/ static PyObject *M_Image_New(PyObject *self, PyObject *args, PyObject *keywords) { - printf ("In Image_New() - unimplemented in 2.25\n"); + printf ("In Image_New() - unimplemented in 2.25\n"); - Py_INCREF(Py_None); - return Py_None; + Py_INCREF(Py_None); + return Py_None; } /*****************************************************************************/ -/* Function: M_Image_Get */ -/* Python equivalent: Blender.Image.Get */ -/* Description: Receives a string and returns the image object */ -/* whose name matches the string. If no argument is */ -/* passed in, a list of all image names in the */ -/* current scene is returned. */ +/* Function: M_Image_Get */ +/* Python equivalent: Blender.Image.Get */ +/* Description: Receives a string and returns the image object */ +/* whose name matches the string. If no argument is */ +/* passed in, a list of all image names in the */ +/* current scene is returned. */ /*****************************************************************************/ static PyObject *M_Image_Get(PyObject *self, PyObject *args) { - char *name = NULL; - Image *img_iter; + char *name = NULL; + Image *img_iter; if (!PyArg_ParseTuple(args, "|s", &name)) - return (EXPP_ReturnPyObjError (PyExc_TypeError, - "expected string argument (or nothing)")); + return (EXPP_ReturnPyObjError (PyExc_TypeError, + "expected string argument (or nothing)")); - img_iter = G.main->image.first; + img_iter = G.main->image.first; if (name) { /* (name) - Search image by name */ - BPy_Image *wanted_image = NULL; + BPy_Image *wanted_image = NULL; - while ((img_iter) && (wanted_image == NULL)) { - if (strcmp (name, img_iter->id.name+2) == 0) { - wanted_image = (BPy_Image *)PyObject_NEW(BPy_Image, &Image_Type); + while ((img_iter) && (wanted_image == NULL)) { + if (strcmp (name, img_iter->id.name+2) == 0) { + wanted_image = (BPy_Image *)PyObject_NEW(BPy_Image, &Image_Type); if (wanted_image) wanted_image->image = img_iter; - } - img_iter = img_iter->id.next; - } + } + img_iter = img_iter->id.next; + } - if (wanted_image == NULL) { /* Requested image doesn't exist */ - char error_msg[64]; - PyOS_snprintf(error_msg, sizeof(error_msg), - "Image \"%s\" not found", name); - return (EXPP_ReturnPyObjError (PyExc_NameError, error_msg)); - } + if (wanted_image == NULL) { /* Requested image doesn't exist */ + char error_msg[64]; + PyOS_snprintf(error_msg, sizeof(error_msg), + "Image \"%s\" not found", name); + return (EXPP_ReturnPyObjError (PyExc_NameError, error_msg)); + } - return (PyObject *)wanted_image; + return (PyObject *)wanted_image; } else { /* () - return a list of all images in the scene */ - int index = 0; - PyObject *img_list, *pyobj; + int index = 0; + PyObject *img_list, *pyobj; - img_list = PyList_New (BLI_countlist (&(G.main->image))); + img_list = PyList_New (BLI_countlist (&(G.main->image))); - if (img_list == NULL) - return (PythonReturnErrorObject (PyExc_MemoryError, - "couldn't create PyList")); + if (img_list == NULL) + return (PythonReturnErrorObject (PyExc_MemoryError, + "couldn't create PyList")); while (img_iter) { - pyobj = Image_CreatePyObject (img_iter); + pyobj = Image_CreatePyObject (img_iter); if (!pyobj) return (PythonReturnErrorObject (PyExc_MemoryError, @@ -163,8 +165,8 @@ static PyObject *M_Image_Get(PyObject *self, PyObject *args) PyList_SET_ITEM (img_list, index, pyobj); - img_iter = img_iter->id.next; - index++; + img_iter = img_iter->id.next; + index++; } return (img_list); @@ -172,49 +174,49 @@ static PyObject *M_Image_Get(PyObject *self, PyObject *args) } /*****************************************************************************/ -/* Function: M_Image_Load */ -/* Python equivalent: Blender.Image.Load */ -/* Description: Receives a string and returns the image object */ -/* whose filename matches the string. */ +/* Function: M_Image_Load */ +/* Python equivalent: Blender.Image.Load */ +/* Description: Receives a string and returns the image object */ +/* whose filename matches the string. */ /*****************************************************************************/ static PyObject *M_Image_Load(PyObject *self, PyObject *args) { - char *fname; - Image *img_ptr; - BPy_Image *img; + char *fname; + Image *img_ptr; + BPy_Image *img; - if (!PyArg_ParseTuple(args, "s", &fname)) - return (EXPP_ReturnPyObjError (PyExc_TypeError, - "expected string argument")); + if (!PyArg_ParseTuple(args, "s", &fname)) + return (EXPP_ReturnPyObjError (PyExc_TypeError, + "expected string argument")); - img = (BPy_Image *)PyObject_NEW(BPy_Image, &Image_Type); + img = (BPy_Image *)PyObject_NEW(BPy_Image, &Image_Type); - if (!img) - return (EXPP_ReturnPyObjError (PyExc_MemoryError, - "couldn't create PyObject Image_Type")); + if (!img) + return (EXPP_ReturnPyObjError (PyExc_MemoryError, + "couldn't create PyObject Image_Type")); - img_ptr = add_image(fname); - if (!img_ptr) - return (EXPP_ReturnPyObjError (PyExc_IOError, - "couldn't load image")); + img_ptr = add_image(fname); + if (!img_ptr) + return (EXPP_ReturnPyObjError (PyExc_IOError, + "couldn't load image")); - img->image = img_ptr; + img->image = img_ptr; - return (PyObject *)img; + return (PyObject *)img; } /*****************************************************************************/ -/* Function: Image_Init */ +/* Function: Image_Init */ /*****************************************************************************/ PyObject *Image_Init (void) { - PyObject *submodule; + PyObject *submodule; - Image_Type.ob_type = &PyType_Type; + Image_Type.ob_type = &PyType_Type; - submodule = Py_InitModule3("Blender.Image", M_Image_methods, M_Image_doc); + submodule = Py_InitModule3("Blender.Image", M_Image_methods, M_Image_doc); - return (submodule); + return (submodule); } /************************/ @@ -222,7 +224,7 @@ PyObject *Image_Init (void) /************************/ /*****************************************************************************/ -/* Python BPy_Image methods declarations: */ +/* Python BPy_Image methods declarations: */ /*****************************************************************************/ static PyObject *Image_getName(BPy_Image *self); static PyObject *Image_getFilename(BPy_Image *self); @@ -233,35 +235,38 @@ static PyObject *Image_getYRep(BPy_Image *self); static PyObject *Image_setName(BPy_Image *self, PyObject *args); static PyObject *Image_setXRep(BPy_Image *self, PyObject *args); static PyObject *Image_setYRep(BPy_Image *self, PyObject *args); +static PyObject *Image_reload(BPy_Image *self); /* by Campbell */ /*****************************************************************************/ -/* Python BPy_Image methods table: */ +/* Python BPy_Image methods table: */ /*****************************************************************************/ static PyMethodDef BPy_Image_methods[] = { /* name, method, flags, doc */ - {"getName", (PyCFunction)Image_getName, METH_NOARGS, - "() - Return Image object name"}, - {"getFilename", (PyCFunction)Image_getFilename, METH_NOARGS, - "() - Return Image object filename"}, - {"getSize", (PyCFunction)Image_getSize, METH_NOARGS, - "() - Return Image object [width, height] dimension in pixels"}, - {"getDepth", (PyCFunction)Image_getDepth, METH_NOARGS, - "() - Return Image object pixel depth"}, - {"getXRep", (PyCFunction)Image_getXRep, METH_NOARGS, - "() - Return Image object x repetition value"}, - {"getYRep", (PyCFunction)Image_getYRep, METH_NOARGS, - "() - Return Image object y repetition value"}, - {"setName", (PyCFunction)Image_setName, METH_VARARGS, - "(str) - Change Image object name"}, - {"setXRep", (PyCFunction)Image_setXRep, METH_VARARGS, - "(int) - Change Image object x repetition value"}, - {"setYRep", (PyCFunction)Image_setYRep, METH_VARARGS, - "(int) - Change Image object y repetition value"}, - {0} + {"getName", (PyCFunction)Image_getName, METH_NOARGS, + "() - Return Image object name"}, + {"getFilename", (PyCFunction)Image_getFilename, METH_NOARGS, + "() - Return Image object filename"}, + {"getSize", (PyCFunction)Image_getSize, METH_NOARGS, + "() - Return Image object [width, height] dimension in pixels"}, + {"getDepth", (PyCFunction)Image_getDepth, METH_NOARGS, + "() - Return Image object pixel depth"}, + {"getXRep", (PyCFunction)Image_getXRep, METH_NOARGS, + "() - Return Image object x repetition value"}, + {"getYRep", (PyCFunction)Image_getYRep, METH_NOARGS, + "() - Return Image object y repetition value"}, + {"reload", (PyCFunction)Image_reload, METH_NOARGS, + "() - Reload the image from the filesystem"}, + {"setName", (PyCFunction)Image_setName, METH_VARARGS, + "(str) - Change Image object name"}, + {"setXRep", (PyCFunction)Image_setXRep, METH_VARARGS, + "(int) - Change Image object x repetition value"}, + {"setYRep", (PyCFunction)Image_setYRep, METH_VARARGS, + "(int) - Change Image object y repetition value"}, + {0} }; /*****************************************************************************/ -/* Python Image_Type callback function prototypes: */ +/* Python Image_Type callback function prototypes: */ /*****************************************************************************/ static void Image_dealloc (BPy_Image *self); static int Image_setAttr (BPy_Image *self, char *name, PyObject *v); @@ -270,47 +275,47 @@ static PyObject *Image_getAttr (BPy_Image *self, char *name); static PyObject *Image_repr (BPy_Image *self); /*****************************************************************************/ -/* Python Image_Type structure definition: */ +/* Python Image_Type structure definition: */ /*****************************************************************************/ PyTypeObject Image_Type = { - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ - "Blender Image", /* tp_name */ - sizeof (BPy_Image), /* tp_basicsize */ - 0, /* tp_itemsize */ - /* methods */ - (destructor)Image_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - (getattrfunc)Image_getAttr, /* tp_getattr */ - (setattrfunc)Image_setAttr, /* tp_setattr */ - (cmpfunc)Image_compare, /* tp_compare */ - (reprfunc)Image_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_as_hash */ - 0,0,0,0,0,0, - 0, /* tp_doc */ - 0,0,0,0,0,0, - BPy_Image_methods, /* tp_methods */ - 0, /* tp_members */ + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "Blender Image", /* tp_name */ + sizeof (BPy_Image), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)Image_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + (getattrfunc)Image_getAttr, /* tp_getattr */ + (setattrfunc)Image_setAttr, /* tp_setattr */ + (cmpfunc)Image_compare, /* tp_compare */ + (reprfunc)Image_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_as_hash */ + 0,0,0,0,0,0, + 0, /* tp_doc */ + 0,0,0,0,0,0, + BPy_Image_methods, /* tp_methods */ + 0, /* tp_members */ }; /*****************************************************************************/ -/* Function: Image_dealloc */ -/* Description: This is a callback function for the BPy_Image type. It is */ -/* the destructor function. */ +/* Function: Image_dealloc */ +/* Description: This is a callback function for the BPy_Image type. It is */ +/* the destructor function. */ /*****************************************************************************/ static void Image_dealloc (BPy_Image *self) { - PyObject_DEL (self); + PyObject_DEL (self); } /*****************************************************************************/ -/* Function: Image_CreatePyObject */ -/* Description: This function will create a new BPy_Image from an existing */ -/* Blender image structure. */ +/* Function: Image_CreatePyObject */ +/* Description: This function will create a new BPy_Image from an existing */ +/* Blender image structure. */ /*****************************************************************************/ PyObject *Image_CreatePyObject (Image *image) { @@ -328,9 +333,9 @@ PyObject *Image_CreatePyObject (Image *image) } /*****************************************************************************/ -/* Function: Image_CheckPyObject */ +/* Function: Image_CheckPyObject */ /* Description: This function returns true when the given PyObject is of the */ -/* type Image. Otherwise it will return false. */ +/* type Image. Otherwise it will return false. */ /*****************************************************************************/ int Image_CheckPyObject (PyObject *pyobj) { @@ -338,8 +343,8 @@ int Image_CheckPyObject (PyObject *pyobj) } /*****************************************************************************/ -/* Function: Image_FromPyObject */ -/* Description: Returns the Blender Image associated with this object */ +/* Function: Image_FromPyObject */ +/* Description: Returns the Blender Image associated with this object */ /*****************************************************************************/ Image *Image_FromPyObject (PyObject *pyobj) { @@ -347,26 +352,26 @@ Image *Image_FromPyObject (PyObject *pyobj) } /*****************************************************************************/ -/* Python BPy_Image methods: */ +/* Python BPy_Image methods: */ /*****************************************************************************/ static PyObject *Image_getName(BPy_Image *self) { - PyObject *attr = PyString_FromString(self->image->id.name+2); + PyObject *attr = PyString_FromString(self->image->id.name+2); - if (attr) return attr; + if (attr) return attr; - return (EXPP_ReturnPyObjError (PyExc_RuntimeError, - "couldn't get Image.name attribute")); + return (EXPP_ReturnPyObjError (PyExc_RuntimeError, + "couldn't get Image.name attribute")); } static PyObject *Image_getFilename(BPy_Image *self) { - PyObject *attr = PyString_FromString(self->image->name); + PyObject *attr = PyString_FromString(self->image->name); - if (attr) return attr; + if (attr) return attr; - return (EXPP_ReturnPyObjError (PyExc_RuntimeError, - "couldn't get Image.filename attribute")); + return (EXPP_ReturnPyObjError (PyExc_RuntimeError, + "couldn't get Image.filename attribute")); } static PyObject *Image_getSize(BPy_Image *self) @@ -385,8 +390,8 @@ static PyObject *Image_getSize(BPy_Image *self) if (attr) return attr; - return EXPP_ReturnPyObjError (PyExc_RuntimeError, - "couldn't get Image.size attribute"); + return EXPP_ReturnPyObjError (PyExc_RuntimeError, + "couldn't get Image.size attribute"); } static PyObject *Image_getDepth(BPy_Image *self) @@ -405,171 +410,183 @@ static PyObject *Image_getDepth(BPy_Image *self) if (attr) return attr; - return EXPP_ReturnPyObjError (PyExc_RuntimeError, - "couldn't get Image.depth attribute"); + return EXPP_ReturnPyObjError (PyExc_RuntimeError, + "couldn't get Image.depth attribute"); } static PyObject *Image_getXRep(BPy_Image *self) { - PyObject *attr = PyInt_FromLong(self->image->xrep); + PyObject *attr = PyInt_FromLong(self->image->xrep); - if (attr) return attr; + if (attr) return attr; - return EXPP_ReturnPyObjError (PyExc_RuntimeError, - "couldn't get Image.xrep attribute"); + return EXPP_ReturnPyObjError (PyExc_RuntimeError, + "couldn't get Image.xrep attribute"); } static PyObject *Image_getYRep(BPy_Image *self) { - PyObject *attr = PyInt_FromLong(self->image->yrep); + PyObject *attr = PyInt_FromLong(self->image->yrep); - if (attr) return attr; + if (attr) return attr; - return EXPP_ReturnPyObjError (PyExc_RuntimeError, - "couldn't get Image.yrep attribute"); + return EXPP_ReturnPyObjError (PyExc_RuntimeError, + "couldn't get Image.yrep attribute"); +} + +static PyObject *Image_reload(BPy_Image *self) +{ + Image *img = self->image; + + free_image_buffers(img); /* force read again */ + img->ok = 1; + image_changed(G.sima, 0); + + Py_INCREF(Py_None); + return Py_None; } static PyObject *Image_setName(BPy_Image *self, PyObject *args) { - char *name; - char buf[21]; + char *name; + char buf[21]; - if (!PyArg_ParseTuple(args, "s", &name)) - return (EXPP_ReturnPyObjError (PyExc_TypeError, - "expected string argument")); - - PyOS_snprintf(buf, sizeof(buf), "%s", name); - - rename_id(&self->image->id, buf); + if (!PyArg_ParseTuple(args, "s", &name)) + return (EXPP_ReturnPyObjError (PyExc_TypeError, + "expected string argument")); + + PyOS_snprintf(buf, sizeof(buf), "%s", name); + + rename_id(&self->image->id, buf); - Py_INCREF(Py_None); - return Py_None; + Py_INCREF(Py_None); + return Py_None; } static PyObject *Image_setXRep(BPy_Image *self, PyObject *args) { - short value; + short value; - if (!PyArg_ParseTuple(args, "h", &value)) - return (EXPP_ReturnPyObjError (PyExc_TypeError, - "expected int argument in [1,16]")); + if (!PyArg_ParseTuple(args, "h", &value)) + return (EXPP_ReturnPyObjError (PyExc_TypeError, + "expected int argument in [1,16]")); - if (value >= EXPP_IMAGE_REP_MIN || value <= EXPP_IMAGE_REP_MAX) - self->image->xrep = value; - else - return (EXPP_ReturnPyObjError (PyExc_ValueError, - "expected int argument in [1,16]")); + if (value >= EXPP_IMAGE_REP_MIN || value <= EXPP_IMAGE_REP_MAX) + self->image->xrep = value; + else + return (EXPP_ReturnPyObjError (PyExc_ValueError, + "expected int argument in [1,16]")); - Py_INCREF(Py_None); - return Py_None; + Py_INCREF(Py_None); + return Py_None; } static PyObject *Image_setYRep(BPy_Image *self, PyObject *args) { - short value; + short value; - if (!PyArg_ParseTuple(args, "h", &value)) - return (EXPP_ReturnPyObjError (PyExc_TypeError, - "expected int argument in [1,16]")); + if (!PyArg_ParseTuple(args, "h", &value)) + return (EXPP_ReturnPyObjError (PyExc_TypeError, + "expected int argument in [1,16]")); - if (value >= EXPP_IMAGE_REP_MIN || value <= EXPP_IMAGE_REP_MAX) - self->image->yrep = value; - else - return (EXPP_ReturnPyObjError (PyExc_ValueError, - "expected int argument in [1,16]")); + if (value >= EXPP_IMAGE_REP_MIN || value <= EXPP_IMAGE_REP_MAX) + self->image->yrep = value; + else + return (EXPP_ReturnPyObjError (PyExc_ValueError, + "expected int argument in [1,16]")); - Py_INCREF(Py_None); - return Py_None; + Py_INCREF(Py_None); + return Py_None; } /*****************************************************************************/ -/* Function: Image_getAttr */ -/* Description: This is a callback function for the BPy_Image type. It is */ -/* the function that accesses BPy_Image member variables and */ -/* methods. */ +/* Function: Image_getAttr */ +/* Description: This is a callback function for the BPy_Image type. It is */ +/* the function that accesses BPy_Image member variables and */ +/* methods. */ /*****************************************************************************/ static PyObject *Image_getAttr (BPy_Image *self, char *name) { - PyObject *attr = Py_None; + PyObject *attr = Py_None; - if (strcmp(name, "name") == 0) - attr = PyString_FromString(self->image->id.name+2); - else if (strcmp(name, "filename") == 0) - attr = PyString_FromString(self->image->name); - else if (strcmp(name, "size") == 0) - attr = Image_getSize(self); - else if (strcmp(name, "depth") == 0) - attr = Image_getDepth(self); - else if (strcmp(name, "xrep") == 0) - attr = PyInt_FromLong(self->image->xrep); - else if (strcmp(name, "yrep") == 0) - attr = PyInt_FromLong(self->image->yrep); + if (strcmp(name, "name") == 0) + attr = PyString_FromString(self->image->id.name+2); + else if (strcmp(name, "filename") == 0) + attr = PyString_FromString(self->image->name); + else if (strcmp(name, "size") == 0) + attr = Image_getSize(self); + else if (strcmp(name, "depth") == 0) + attr = Image_getDepth(self); + else if (strcmp(name, "xrep") == 0) + attr = PyInt_FromLong(self->image->xrep); + else if (strcmp(name, "yrep") == 0) + attr = PyInt_FromLong(self->image->yrep); - else if (strcmp(name, "__members__") == 0) - attr = Py_BuildValue("[s,s,s,s,s,s]", - "name", "filename", "size", "depth", "xrep", "yrep"); + else if (strcmp(name, "__members__") == 0) + attr = Py_BuildValue("[s,s,s,s,s,s]", + "name", "filename", "size", "depth", "xrep", "yrep"); - if (!attr) - return (EXPP_ReturnPyObjError (PyExc_MemoryError, - "couldn't create PyObject")); + if (!attr) + return (EXPP_ReturnPyObjError (PyExc_MemoryError, + "couldn't create PyObject")); - if (attr != Py_None) return attr; /* attribute found, return its value */ + if (attr != Py_None) return attr; /* attribute found, return its value */ - /* not an attribute, search the methods table */ - return Py_FindMethod(BPy_Image_methods, (PyObject *)self, name); + /* not an attribute, search the methods table */ + return Py_FindMethod(BPy_Image_methods, (PyObject *)self, name); } /*****************************************************************************/ -/* Function: Image_setAttr */ +/* Function: Image_setAttr */ /* Description: This is a callback function for the BPy_Image type. It is the*/ -/* function that changes Image object members values. If this */ -/* data is linked to a Blender Image, it also gets updated. */ +/* function that changes Image object members values. If this */ +/* data is linked to a Blender Image, it also gets updated. */ /*****************************************************************************/ static int Image_setAttr (BPy_Image *self, char *name, PyObject *value) { - PyObject *valtuple; - PyObject *error = NULL; + PyObject *valtuple; + PyObject *error = NULL; -/* We're playing a trick on the Python API users here. Even if they use +/* We're playing a trick on the Python API users here. Even if they use * Image.member = val instead of Image.setMember(value), we end up using the * function anyway, since it already has error checking, clamps to the right * interval and updates the Blender Image structure when necessary. */ - valtuple = Py_BuildValue("(O)", value); /*the set* functions expect a tuple*/ + valtuple = Py_BuildValue("(O)", value); /*the set* functions expect a tuple*/ - if (!valtuple) - return EXPP_ReturnIntError(PyExc_MemoryError, - "ImageSetAttr: couldn't create PyTuple"); + if (!valtuple) + return EXPP_ReturnIntError(PyExc_MemoryError, + "ImageSetAttr: couldn't create PyTuple"); - if (strcmp (name, "name") == 0) - error = Image_setName (self, valtuple); - else if (strcmp (name, "xrep") == 0) - error = Image_setXRep (self, valtuple); - else if (strcmp (name, "yrep") == 0) - error = Image_setYRep (self, valtuple); - else { /* Error: no such member in the Image object structure */ - Py_DECREF(value); - Py_DECREF(valtuple); - return (EXPP_ReturnIntError (PyExc_KeyError, - "attribute not found or immutable")); - } + if (strcmp (name, "name") == 0) + error = Image_setName (self, valtuple); + else if (strcmp (name, "xrep") == 0) + error = Image_setXRep (self, valtuple); + else if (strcmp (name, "yrep") == 0) + error = Image_setYRep (self, valtuple); + else { /* Error: no such member in the Image object structure */ + Py_DECREF(value); + Py_DECREF(valtuple); + return (EXPP_ReturnIntError (PyExc_KeyError, + "attribute not found or immutable")); + } - Py_DECREF(valtuple); + Py_DECREF(valtuple); - if (error != Py_None) return -1; + if (error != Py_None) return -1; - Py_DECREF(Py_None); /* incref'ed by the called set* function */ - return 0; /* normal exit */ + Py_DECREF(Py_None); /* incref'ed by the called set* function */ + return 0; /* normal exit */ } /*****************************************************************************/ -/* Function: Image_compare */ -/* Description: This is a callback function for the BPy_Image type. It */ -/* compares two Image_Type objects. Only the "==" and "!=" */ -/* comparisons are meaninful. Returns 0 for equality and -1 if */ -/* they don't point to the same Blender Image struct. */ -/* In Python it becomes 1 if they are equal, 0 otherwise. */ +/* Function: Image_compare */ +/* Description: This is a callback function for the BPy_Image type. It */ +/* compares two Image_Type objects. Only the "==" and "!=" */ +/* comparisons are meaninful. Returns 0 for equality and -1 if */ +/* they don't point to the same Blender Image struct. */ +/* In Python it becomes 1 if they are equal, 0 otherwise. */ /*****************************************************************************/ static int Image_compare (BPy_Image *a, BPy_Image *b) { @@ -578,11 +595,11 @@ static int Image_compare (BPy_Image *a, BPy_Image *b) } /*****************************************************************************/ -/* Function: Image_repr */ -/* Description: This is a callback function for the BPy_Image type. It */ -/* builds a meaninful string to represent image objects. */ +/* Function: Image_repr */ +/* Description: This is a callback function for the BPy_Image type. It */ +/* builds a meaninful string to represent image objects. */ /*****************************************************************************/ static PyObject *Image_repr (BPy_Image *self) { - return PyString_FromFormat("[Image \"%s\"]", self->image->id.name+2); + return PyString_FromFormat("[Image \"%s\"]", self->image->id.name+2); } diff --git a/source/blender/python/api2_2x/doc/Image.py b/source/blender/python/api2_2x/doc/Image.py index 40ca9328617..4c8a525d513 100644 --- a/source/blender/python/api2_2x/doc/Image.py +++ b/source/blender/python/api2_2x/doc/Image.py @@ -104,6 +104,15 @@ class Image: This is for texture tiling. @rtype: int """ + def reload(): + """ + Reloads this image from the filesystem. If used within a loop you need to + redraw the Window to see the change in the image, e.g. with + Window.RedrawAll(). + @warn: if the image file is corrupt or still being written, it will be + replaced by a blank image in Blender, but no error will be returned. + @returns: None + """ def setName(name): """