[Bf-blender-cvs] [de4c81c1533] blender2.8: Fix merge error in bpy_driver.c
Campbell Barton
noreply at git.blender.org
Mon Jun 18 15:12:18 CEST 2018
Commit: de4c81c153398e750ca8b5452e43fe8d65edc166
Author: Campbell Barton
Date: Mon Jun 18 15:09:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBde4c81c153398e750ca8b5452e43fe8d65edc166
Fix merge error in bpy_driver.c
===================================================================
M 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 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);
}
}
}
More information about the Bf-blender-cvs
mailing list