diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 08:27:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 08:27:53 +0300 |
commit | 55939bf21936c6bef5c350fbf679c08a7c57ea88 (patch) | |
tree | 0749c2e1d69a918266e842155203e607fd5d86af /source/blender/editors/armature/armature_edit.c | |
parent | 61a22262d19e21d457b7a06166c207d2cba717a2 (diff) | |
parent | 80f7249d09a76b7e045525fa8f78c7d660a8749d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature/armature_edit.c')
-rw-r--r-- | source/blender/editors/armature/armature_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index f41aa432b35..75b80627dff 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -1303,7 +1303,7 @@ static int armature_delete_selected_exec(bContext *C, wmOperator *UNUSED(op)) { bArmature *arm; EditBone *curBone, *ebone_next; - Object *obedit = CTX_data_edit_object(C); // XXX get from context + Object *obedit = CTX_data_edit_object(C); bool changed = false; arm = obedit->data; |