From cad9cb563d48bd6787eb7ac8bc773ce625a8ae1a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 16 Dec 2011 03:06:56 +0000 Subject: fix own error [#29631] frame is lost from driver namespace after reload --- source/blender/python/intern/bpy_driver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/python') diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index db408374b7f..e628cb891d8 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -94,13 +94,12 @@ int bpy_pydriver_create_dict(void) /* note, this function should do nothing most runs, only when changing frame */ static PyObject *bpy_pydriver_InternStr__frame= NULL; +/* not thread safe but neither is python */ +static float bpy_pydriver_evaltime_prev= FLT_MAX; static void bpy_pydriver_update_dict(const float evaltime) { - /* not thread safe but neither is python */ - static float evaltime_prev= FLT_MAX; - - if (evaltime_prev != evaltime) { + if (bpy_pydriver_evaltime_prev != evaltime) { /* currently only update the frame */ if (bpy_pydriver_InternStr__frame == NULL) { @@ -111,7 +110,7 @@ static void bpy_pydriver_update_dict(const float evaltime) bpy_pydriver_InternStr__frame, PyFloat_FromDouble(evaltime)); - evaltime_prev= evaltime; + bpy_pydriver_evaltime_prev= evaltime; } } @@ -137,6 +136,7 @@ void BPY_driver_reset(void) if (bpy_pydriver_InternStr__frame) { Py_DECREF(bpy_pydriver_InternStr__frame); bpy_pydriver_InternStr__frame= NULL; + bpy_pydriver_evaltime_prev= FLT_MAX; } if (use_gil) -- cgit v1.2.3