From de4c81c153398e750ca8b5452e43fe8d65edc166 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 18 Jun 2018 15:09:55 +0200 Subject: Fix merge error in bpy_driver.c --- source/blender/python/intern/bpy_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/python/intern') diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index fd405e9f14b..b8c71d4e054 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -563,7 +563,7 @@ float BPY_driver_exec(struct PathResolvedRNA *anim_rna, ChannelDriver *driver, C { Py_DECREF(expr_code); expr_code = NULL; - PyTuple_SET_ITEM(((PyObject *)driver->expr_comp), 0, NULL); + PyTuple_SET_ITEM(((PyObject *)driver_orig->expr_comp), 0, NULL); } } } -- cgit v1.2.3