From 33a5a69d254103809582d95c8b1b78720da50841 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 3 Jan 2011 12:11:05 +0000 Subject: fix for own error with mathutils.geometry argument parsing. also raise ValueError when the vector size is incorrect rather then type error. --- source/blender/python/intern/bpy_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/python/intern/bpy_driver.c') diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index e055a8b0bc8..7ca7604e938 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -124,7 +124,7 @@ void BPY_reset_driver(void) } /* error return function for BPY_eval_pydriver */ -static float pydriver_error(ChannelDriver *driver) +static void pydriver_error(ChannelDriver *driver) { driver->flag |= DRIVER_FLAG_INVALID; /* py expression failed */ fprintf(stderr, "\nError in Driver: The following Python expression failed:\n\t'%s'\n\n", driver->expression); @@ -132,8 +132,6 @@ static float pydriver_error(ChannelDriver *driver) // BPy_errors_to_report(NULL); // TODO - reports PyErr_Print(); PyErr_Clear(); - - return 0.0f; } /* This evals py driver expressions, 'expr' is a Python expression that @@ -232,7 +230,7 @@ float BPY_eval_driver (ChannelDriver *driver) /* try to add to dictionary */ /* if (PyDict_SetItemString(driver_vars, dvar->name, driver_arg)) { */ - if (PyDict_SetItem(driver_vars, PyTuple_GET_ITEM(expr_vars, i++), driver_arg)) { /* use string interning for faster namespace creation */ + if (PyDict_SetItem(driver_vars, PyTuple_GET_ITEM(expr_vars, i++), driver_arg) < 0) { /* use string interning for faster namespace creation */ /* this target failed - bad name */ if (targets_ok) { /* first one - print some extra info for easier identification */ -- cgit v1.2.3