diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-07 09:49:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-07 09:49:22 +0300 |
| commit | ee2e30683c1c4ebe14096d8e5f64a5a0099343e6 (patch) | |
| tree | 9a24fc58ba8dd876a0fd29d37131942f70723ee0 /source/blender/editors/armature/armature_edit.c | |
| parent | db1a04313c3223250b6e6ae1b3652f0a134b8239 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/editors/armature/armature_edit.c')
| -rw-r--r-- | source/blender/editors/armature/armature_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index 2e0d49b9683..16e5450423b 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -966,7 +966,7 @@ static int armature_merge_exec(bContext *C, wmOperator *op) /* get chains (ends on chains) */ chains_find_tips(arm->edbo, &chains); if (BLI_listbase_is_empty(&chains)) { - continue; + continue; } /* each 'chain' is the last bone in the chain (with no children) */ @@ -982,8 +982,8 @@ static int armature_merge_exec(bContext *C, wmOperator *op) for (ebo = chain->data; ebo; child = ebo, ebo = ebo->parent) { /* check if visible + selected */ if (EBONE_VISIBLE(arm, ebo) && - ((ebo->flag & BONE_CONNECTED) || (ebo->parent == NULL)) && - (ebo->flag & BONE_SELECTED) ) + ((ebo->flag & BONE_CONNECTED) || (ebo->parent == NULL)) && + (ebo->flag & BONE_SELECTED) ) { /* set either end or start (end gets priority, unless it is already set) */ if (bend == NULL) { |