[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47642] trunk/blender/source/blender/ python/intern/bpy_interface.c: fix for un-handled exception when entering in multiple values to a button, floats were not correctly checked for.

Campbell Barton ideasman42 at gmail.com
Sat Jun 9 18:45:50 CEST 2012


Revision: 47642
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47642
Author:   campbellbarton
Date:     2012-06-09 16:45:42 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
fix for un-handled exception when entering in multiple values to a button, floats were not correctly checked for.

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_interface.c

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2012-06-09 15:32:24 UTC (rev 47641)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2012-06-09 16:45:42 UTC (rev 47642)
@@ -537,7 +537,12 @@
 			val = 0.0;
 
 			for (i = 0; i < PyTuple_GET_SIZE(retval); i++) {
-				val += PyFloat_AsDouble(PyTuple_GET_ITEM(retval, i));
+				const double val_item = PyFloat_AsDouble(PyTuple_GET_ITEM(retval, i));
+				if (val_item == -1 && PyErr_Occurred()) {
+					val = -1;
+					break;
+				}
+				val += val_item;
 			}
 		}
 		else {




More information about the Bf-blender-cvs mailing list