From fc5a37b94ec55fa446395914e517c65aa3eef636 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 Apr 2016 15:25:32 +1000 Subject: Recent pydriver update missed setting 'curval' Using PyObject's for drivers (82b0a9e36) still needs to set the 'current value' for debug info to display in the UI. Resolves T48251 --- source/blender/python/intern/bpy_driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (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 f9c0982a4c3..9cd6fe3da91 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -273,6 +273,22 @@ float BPY_driver_exec(ChannelDriver *driver, const float evaltime) if (driver_arg == NULL) { driver_arg = PyFloat_FromDouble(0.0); + dvar->curval = 0.0f; + } + else { + /* no need to worry about overflow here, values from RNA are within limits. */ + if (PyFloat_CheckExact(driver_arg)) { + dvar->curval = (float)PyFloat_AsDouble(driver_arg); + } + else if (PyLong_CheckExact(driver_arg)) { + dvar->curval = (float)PyLong_AsLong(driver_arg); + } + else if (PyBool_Check(driver_arg)) { + dvar->curval = (driver_arg == Py_True); + } + else { + dvar->curval = 0.0f; + } } } else -- cgit v1.2.3