diff options
author | Alexander Gavrilov <angavrilov@gmail.com> | 2018-12-01 19:43:10 +0300 |
---|---|---|
committer | Alexander Gavrilov <angavrilov@gmail.com> | 2018-12-01 19:44:24 +0300 |
commit | 18f06186778ea67583a362a611b1efa8c9da5fbd (patch) | |
tree | 70f2fd8b2d9f9f0d9c47899d2ea210d1b9d8a71a /source/blender/editors/armature/armature_edit.c | |
parent | 9ed522db735b1d798a5d68c6bf547e8123d33a4b (diff) |
Fix T58412: in weight paint + pose mode certain armature operations crash.
The cause is that FOREACH_OBJECT_IN_MODE_BEGIN assumed that the active
object is in the correct mode, which is wrong in this case. It also
only considered objects of the same type as active, which had to be
replaced with an explicit type parameter.
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 f19fea32698..e44c1b02f22 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -709,7 +709,7 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op) Object *obedit = NULL; { ViewLayer *view_layer = CTX_data_view_layer(C); - FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, v3d, OB_MODE_EDIT, ob_iter) { + FOREACH_OBJECT_IN_EDIT_MODE_BEGIN (view_layer, v3d, ob_iter) { if (ob_iter->data == arm) { obedit = ob_iter; } |