diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:11:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:23:41 +0300 |
| commit | c35f1d05eaa13348d4f33cdb44f6fb62f68e1ba3 (patch) | |
| tree | 698066b5eade15949b0453796c4d9fc466df42ac /source/blender/editors/armature/armature_relations.c | |
| parent | 09d26cab0bdde16529debd3e0271252012ba69eb (diff) | |
Farewell Scene->basact
Diffstat (limited to 'source/blender/editors/armature/armature_relations.c')
| -rw-r--r-- | source/blender/editors/armature/armature_relations.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 51c9836c741..0705d17882c 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -403,7 +403,7 @@ int join_armature_exec(bContext *C, wmOperator *op) } /* Free the old object data */ - ED_base_object_free_and_unlink(bmain, scene, base->object); + ED_object_base_free_and_unlink(bmain, scene, base->object); } } CTX_DATA_END; |