diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-09-27 11:24:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-09-27 11:24:11 +0300 |
| commit | d187c6d8d64933b43ae15a21dde65794f57e9a28 (patch) | |
| tree | 7d480eb8221ee891cde195e45ba3edc684b756ff /source/blender/editors/object/object_select.c | |
| parent | 14bac995f38251f4a6b7b210ef968dc5311580e8 (diff) | |
Fix T46285: "Select parent" if there is no parent doesn't work correctly.
Diffstat (limited to 'source/blender/editors/object/object_select.c')
| -rw-r--r-- | source/blender/editors/object/object_select.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 83334e4e6a3..f69f76cbcc3 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -854,47 +854,47 @@ static int object_select_grouped_exec(bContext *C, wmOperator *op) switch (type) { case OBJECT_GRPSEL_CHILDREN_RECURSIVE: - changed = select_grouped_children(C, ob, true); + changed |= select_grouped_children(C, ob, true); break; case OBJECT_GRPSEL_CHILDREN: - changed = select_grouped_children(C, ob, false); + changed |= select_grouped_children(C, ob, false); break; case OBJECT_GRPSEL_PARENT: - changed = select_grouped_parent(C); + changed |= select_grouped_parent(C); break; case OBJECT_GRPSEL_SIBLINGS: - changed = select_grouped_siblings(C, ob); + changed |= select_grouped_siblings(C, ob); break; case OBJECT_GRPSEL_TYPE: - changed = select_grouped_type(C, ob); + changed |= select_grouped_type(C, ob); break; case OBJECT_GRPSEL_LAYER: - changed = select_grouped_layer(C, ob); + changed |= select_grouped_layer(C, ob); break; case OBJECT_GRPSEL_GROUP: - changed = select_grouped_group(C, ob); + changed |= select_grouped_group(C, ob); break; case OBJECT_GRPSEL_HOOK: - changed = select_grouped_object_hooks(C, ob); + changed |= select_grouped_object_hooks(C, ob); break; case OBJECT_GRPSEL_PASS: - changed = select_grouped_index_object(C, ob); + changed |= select_grouped_index_object(C, ob); break; case OBJECT_GRPSEL_COLOR: - changed = select_grouped_color(C, ob); + changed |= select_grouped_color(C, ob); break; case OBJECT_GRPSEL_PROPERTIES: - changed = select_grouped_gameprops(C, ob); + changed |= select_grouped_gameprops(C, ob); break; case OBJECT_GRPSEL_KEYINGSET: - changed = select_grouped_keyingset(C, ob, op->reports); + changed |= select_grouped_keyingset(C, ob, op->reports); break; case OBJECT_GRPSEL_LAMP_TYPE: if (ob->type != OB_LAMP) { BKE_report(op->reports, RPT_ERROR, "Active object must be a lamp"); break; } - changed = select_grouped_lamptype(C, ob); + changed |= select_grouped_lamptype(C, ob); break; default: break; |