Py-Driver: re-use self PyObject when its unchanged.

1 files changed, 37 insertions, 7 deletions

diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c
index 82507dcba04..a03c50d8c90 100644
--- a/source/blender/python/intern/bpy_driver.c
+++ b/source/blender/python/intern/bpy_driver.c
@@ -100,24 +100,48 @@ int bpy_pydriver_create_dict(void)
 
 /* note, this function should do nothing most runs, only when changing frame */
 /* not thread safe but neither is python */
-static float bpy_pydriver_evaltime_prev = FLT_MAX;
+static struct {
+	float evaltime;
+
+	/* borrowed reference to the 'self' in 'bpy_pydriver_Dict'
+	 * keep for as long as the same self is used. */
+	PyObject *self;
+} g_pydriver_state_prev = {
+	.evaltime = FLT_MAX,
+	.self = NULL,
+};
 
 static void bpy_pydriver_namespace_update_frame(const float evaltime)
 {
-	if (bpy_pydriver_evaltime_prev != evaltime) {
+	if (g_pydriver_state_prev.evaltime != evaltime) {
 		PyObject *item = PyFloat_FromDouble(evaltime);
 		PyDict_SetItem(bpy_pydriver_Dict, bpy_intern_str_frame, item);
 		Py_DECREF(item);
 
-		bpy_pydriver_evaltime_prev = evaltime;
+		g_pydriver_state_prev.evaltime = evaltime;
 	}
 }
 
 static void bpy_pydriver_namespace_update_self(struct PathResolvedRNA *anim_rna)
 {
-	PyObject *item = pyrna_driver_self_from_anim_rna(anim_rna);
-	PyDict_SetItem(bpy_pydriver_Dict, bpy_intern_str_self, item);
-	Py_DECREF(item);
+	if ((g_pydriver_state_prev.self == NULL) ||
+	    (pyrna_driver_is_equal_anim_rna(anim_rna, g_pydriver_state_prev.self) == false))
+	{
+		PyObject *item = pyrna_driver_self_from_anim_rna(anim_rna);
+		PyDict_SetItem(bpy_pydriver_Dict, bpy_intern_str_self, item);
+		Py_DECREF(item);
+
+		g_pydriver_state_prev.self = item;
+	}
+}
+
+static void bpy_pydriver_namespace_clear_self(void)
+{
+	if (g_pydriver_state_prev.self) {
+		PyDict_DelItem(bpy_pydriver_Dict, bpy_intern_str_self);
+
+		g_pydriver_state_prev.self = NULL;
+	}
 }
 
 /* Update function, it gets rid of pydrivers global dictionary, forcing
@@ -139,7 +163,10 @@ void BPY_driver_reset(void)
 		bpy_pydriver_Dict = NULL;
 	}
 
-	bpy_pydriver_evaltime_prev = FLT_MAX;
+	g_pydriver_state_prev.evaltime = FLT_MAX;
+
+	/* freed when clearing driver dict */
+	g_pydriver_state_prev.self = NULL;
 
 	if (use_gil)
 		PyGILState_Release(gilstate);
@@ -225,6 +252,9 @@ float BPY_driver_exec(struct PathResolvedRNA *anim_rna, ChannelDriver *driver, c
 	if (driver->flag & DRIVER_FLAG_USE_SELF) {
 		bpy_pydriver_namespace_update_self(anim_rna);
 	}
+	else {
+		bpy_pydriver_namespace_clear_self();
+	}
 
 	if (driver->expr_comp == NULL)
 		driver->flag |= DRIVER_FLAG_RECOMPILE;