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>2018-06-18 16:09:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-18 16:09:55 +0300
commitde4c81c153398e750ca8b5452e43fe8d65edc166 (patch)
treee8d276d4d92eb4701840c65b24bb1f38ae76a148 /source/blender/python/intern
parentc655c65987c635a4ac9777b9ea73d2fe84b6a3a1 (diff)
Fix merge error in bpy_driver.c
Diffstat (limited to 'source/blender/python/intern')
-rw-r--r--source/blender/python/intern/bpy_driver.c2
1 files changed, 1 insertions, 1 deletions
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);
}
}
}