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

[Ken Hughes]

Revision: 17865
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17865
Author:   khughes
Date:     2008-12-15 06:30:09 +0100 (Mon, 15 Dec 2008)

Log Message:
-----------
Python API
----------
Bugfix #18044: missing return statements in getter for displacement modifier
caused incorrect values to be returned.

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

Modified: trunk/blender/source/blender/python/api2_2x/Modifier.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Modifier.c	2008-12-15 05:21:44 UTC (rev 17864)
+++ trunk/blender/source/blender/python/api2_2x/Modifier.c	2008-12-15 05:30:09 UTC (rev 17865)
@@ -909,18 +909,18 @@
 
 	switch( type ) {
 	case EXPP_MOD_TEXTURE:
-		if (md->texture)	Texture_CreatePyObject( md->texture );
+		if (md->texture)	return Texture_CreatePyObject( md->texture );
 		else				Py_RETURN_NONE;
 	case EXPP_MOD_STRENGTH:
 		return PyFloat_FromDouble( (double)md->strength );
 	case EXPP_MOD_DIRECTION:
-		PyInt_FromLong( md->direction );
+		return PyInt_FromLong( md->direction );
 	case EXPP_MOD_VERTGROUP:
 		return PyString_FromString( md->defgrp_name ) ;
 	case EXPP_MOD_MID_LEVEL:
 		return PyFloat_FromDouble( (double)md->midlevel );
 	case EXPP_MOD_MAPPING:
-		PyInt_FromLong( md->texmapping );
+		return PyInt_FromLong( md->texmapping );
 	case EXPP_MOD_OBJECT:
 		return Object_CreatePyObject( md->map_object );
 	case EXPP_MOD_UVLAYER:

Modified: trunk/blender/source/blender/python/api2_2x/doc/Modifier.py
===================================================================
--- trunk/blender/source/blender/python/api2_2x/doc/Modifier.py	2008-12-15 05:21:44 UTC (rev 17864)
+++ trunk/blender/source/blender/python/api2_2x/doc/Modifier.py	2008-12-15 05:30:09 UTC (rev 17865)
@@ -129,7 +129,7 @@
 	- UVLAYER - Used for Displace only
 	- MID_LEVEL - Used for Displace only (float [0.0, 1.0], default: 0.5)
 	- STRENGTH - Used for Displace only (float [-1000.0, 1000.0, default: 1.0)
-	- TEXTURE - Used for Displace only (string)
+	- TEXTURE - Used for Displace only (Texture object)
 	- MAPPING - Used for Displace only
 	- DIRECTION - Used for Displace only