[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13993] trunk/blender/source/blender/ python/api2_2x: Python API

[Ken Hughes]

Revision: 13993
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13993
Author:   khughes
Date:     2008-03-06 22:43:22 +0100 (Thu, 06 Mar 2008)

Log Message:
-----------
Python API
----------
Bugfix #8472: texture.image setter did not accept None to remove an image, or
set the image type once an image was assigned.

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/Texture.c
    trunk/blender/source/blender/python/api2_2x/doc/Texture.py

Modified: trunk/blender/source/blender/python/api2_2x/Texture.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Texture.c	2008-03-06 21:25:15 UTC (rev 13992)
+++ trunk/blender/source/blender/python/api2_2x/Texture.c	2008-03-06 21:43:22 UTC (rev 13993)
@@ -1563,16 +1563,23 @@
 {
 	Image *blimg = NULL;
 
-	if( !BPy_Image_Check (value) )
+	if ( value != Py_None && !BPy_Image_Check (value) )
 		return EXPP_ReturnIntError( PyExc_TypeError,
-					      "expected an Image" );
-	blimg = Image_FromPyObject( value );
+					      "expected an Image or None" );
 
+
 	if( self->texture->ima ) {
 		self->texture->ima->id.us--;
+		self->texture->ima = NULL;
 	}
 
+	if ( value == Py_None )
+		return 0;
+
+	blimg = Image_FromPyObject( value );
+
 	self->texture->ima = blimg;
+	self->texture->type = TEX_IMAGE;
 	BKE_image_signal(blimg, &self->texture->iuser, IMA_SIGNAL_RELOAD );
 	id_us_plus( &blimg->id );
 

Modified: trunk/blender/source/blender/python/api2_2x/doc/Texture.py
===================================================================
--- trunk/blender/source/blender/python/api2_2x/doc/Texture.py	2008-03-06 21:25:15 UTC (rev 13992)
+++ trunk/blender/source/blender/python/api2_2x/doc/Texture.py	2008-03-06 21:43:22 UTC (rev 13993)
@@ -432,7 +432,7 @@
 		"""
 		Set the Image of this texture.
 		@param image: The new Image.
-		@type image: Blender Image
+		@type image: Blender Image or None.
 		@warning: This sets the texture's type to 'Image' if it is not already.
 		"""