Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-09 20:45:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-09 20:45:42 +0400
commit2f60d9b0b9af1df967e29fd1822d82ffd2450d0f (patch)
tree9b272ff575655bd6680add261d17544ae6cf3260
parent56c5c63f57a6e4e5f88a3ca6ad141684ecd3ac09 (diff)
fix for un-handled exception when entering in multiple values to a button, floats were not correctly checked for.
-rw-r--r--source/blender/python/intern/bpy_interface.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 73188b3f830..ac9ff4c8ef5 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -537,7 +537,12 @@ int BPY_button_exec(bContext *C, const char *expr, double *value, const short ve
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 {