diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:28:14 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:28:14 +0300 |
| commit | 5508b572ea9bb2d3b758cae6898035005e8ebb2a (patch) | |
| tree | ed65bfb15b368be1f4516fb6b73fa8a332d3444a /source/blender/editors/armature/armature_relations.c | |
| parent | 75bcb70c60172e61d2e564c88f78843d617eb919 (diff) | |
Cleanup: remove some G.main from ED's animsys.
The easy ones - there some much, much trickier to tackle there...
Diffstat (limited to 'source/blender/editors/armature/armature_relations.c')
| -rw-r--r-- | source/blender/editors/armature/armature_relations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 3506b8a8a60..acdda9980d9 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -374,7 +374,7 @@ int join_armature_exec(bContext *C, wmOperator *op) } else { /* merge in data - we'll fix the drivers manually */ - BKE_animdata_merge_copy(&ob->id, &base->object->id, ADT_MERGECOPY_KEEP_DST, false); + BKE_animdata_merge_copy(bmain, &ob->id, &base->object->id, ADT_MERGECOPY_KEEP_DST, false); } } @@ -385,7 +385,7 @@ int join_armature_exec(bContext *C, wmOperator *op) } else { /* merge in data - we'll fix the drivers manually */ - BKE_animdata_merge_copy(&arm->id, &curarm->id, ADT_MERGECOPY_KEEP_DST, false); + BKE_animdata_merge_copy(bmain, &arm->id, &curarm->id, ADT_MERGECOPY_KEEP_DST, false); } } |