[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15392] trunk/blender/source/blender: Daniel's last commit fixed the bug, but checking for the PyObject isn' t needed.

[Campbell Barton]

Revision: 15392
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15392
Author:   campbellbarton
Date:     2008-06-30 18:21:08 +0200 (Mon, 30 Jun 2008)

Log Message:
-----------
Daniel's last commit fixed the bug, but checking for the PyObject isn't needed.
also fixed own tooltip typo

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/Lamp.c
    trunk/blender/source/blender/src/buttons_logic.c

Modified: trunk/blender/source/blender/python/api2_2x/Lamp.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Lamp.c	2008-06-30 15:02:22 UTC (rev 15391)
+++ trunk/blender/source/blender/python/api2_2x/Lamp.c	2008-06-30 16:21:08 UTC (rev 15392)
@@ -1520,14 +1520,9 @@
 	char *type = PyString_AsString(value);
 	PyObject *arg, *error;
 
-	/* parse string argument */
-
-	if( !value )
-		return ( EXPP_ReturnPyObjError( PyExc_TypeError,
-						"expected string argument" ) );
-	
+	/* parse string argument */	
 	if( !type ) 
-		return EXPP_ReturnPyObjError ( PyExc_AttributeError,
+		return EXPP_ReturnPyObjError ( PyExc_TypeError,
 					       "expected string argument" );
 	
 	/* check for valid arguments, set type accordingly */

Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c	2008-06-30 15:02:22 UTC (rev 15391)
+++ trunk/blender/source/blender/src/buttons_logic.c	2008-06-30 16:21:08 UTC (rev 15392)
@@ -1703,7 +1703,7 @@
 			}
 						
 			uiDefButI(block, NUM, 0, "Blendin: ", xco+30, yco-64, (width-60)/2, 19, &aa->blendin, 0.0, MAXFRAMEF, 0.0, 0.0, "Number of frames of motion blending");
-			uiDefButS(block, NUM, 0, "Priority: ", xco+30+(width-60)/2, yco-64, (width-60)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers, With 2 or more actions at once, the overriding clannels must be lower in the stack");
+			uiDefButS(block, NUM, 0, "Priority: ", xco+30+(width-60)/2, yco-64, (width-60)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers, With 2 or more actions at once, the overriding channels must be lower in the stack");
 			
 			uiDefBut(block, TEX, 0, "FrameProp: ",xco+30, yco-84, width-60, 19, aa->frameProp, 0.0, 31.0, 0, 0, "Assign this property this actions current frame number");