Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillian Padovani Germano <wpgermano@gmail.com>2005-02-02 06:38:31 +0300
committerWillian Padovani Germano <wpgermano@gmail.com>2005-02-02 06:38:31 +0300
commit41b251fab087f6f6dbea4439136949c392c2019d (patch)
treeac538bf5626308e33ca00707c8e60c46561b351a /source/blender/python/api2_2x/Image.c
parent78f133b8a7bc1db280d5d052bf83d7ea959cd1cb (diff)
BPython:
- Fix related to bug #2157: crash in Blender.Image.image.reload() method. "G.sima" was not being checked for validity. Fix by Joilnen B. Leite (pidhash). Thanks! http://projects.blender.org/tracker/?func=detail&atid=125&aid=2157&group_id=9 - Added optional argument to Blender.Object.object.getData() method: getData(only_name = True) or (only_name = 1) or (1) will return only the obdata name, not a wrapper for the given struct. This is a test based on a request by Campbell Barton who submitted code for his proposed .getDataName() method (thanks!). - doc updates and small fixes.
Diffstat (limited to 'source/blender/python/api2_2x/Image.c')
-rw-r--r--source/blender/python/api2_2x/Image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/api2_2x/Image.c b/source/blender/python/api2_2x/Image.c
index a27cba7d2a2..d4debde9000 100644
--- a/source/blender/python/api2_2x/Image.c
+++ b/source/blender/python/api2_2x/Image.c
@@ -25,7 +25,7 @@
*
* This is a new part of Blender.
*
- * Contributor(s): Willian P. Germano, Campbell Barton
+ * Contributor(s): Willian P. Germano, Campbell Barton, Joilnen B. Leite
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
@@ -481,7 +481,7 @@ static PyObject *Image_reload( BPy_Image * self )
free_image_buffers( img ); /* force read again */
img->ok = 1;
- image_changed( G.sima, 0 );
+ if (G.sima) image_changed( G.sima, 0 );
Py_INCREF( Py_None );
return Py_None;