diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-30 08:31:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-30 08:31:35 +0300 |
| commit | 2c03d6a12be29b020dfdd483462322e4dd8f8d98 (patch) | |
| tree | 9aac1ad8d837e5c85ac10208a8bcd143127ed654 /source | |
| parent | f7af08b5feecd89ea32c8905de1e61d575ff4bf1 (diff) | |
DNA: add OB_DATA_SUPPORT_EDITMODE macro
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 760673e5a5f..9c3b9c7b179 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -951,7 +951,7 @@ static void do_outliner_item_activate_tree_element( WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene); } - else if (ELEM(te->idcode, ID_ME, ID_CU, ID_MB, ID_LT, ID_AR)) { + else if (OB_DATA_SUPPORT_EDITMODE(te->idcode)) { WM_operator_name_call(C, "OBJECT_OT_editmode_toggle", WM_OP_INVOKE_REGION_WIN, NULL); } else { // rest of types diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index e0b4d117bd1..ae84108864e 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -378,6 +378,10 @@ enum { #define OB_TYPE_SUPPORT_PARVERT(_type) \ (ELEM(_type, OB_MESH, OB_SURF, OB_CURVE, OB_LATTICE)) +/** Matches #OB_TYPE_SUPPORT_EDITMODE. */ +#define OB_DATA_SUPPORT_EDITMODE(_type) \ + (ELEM(_type, ID_ME, ID_CU, ID_MB, ID_LT, ID_AR)) + /* is this ID type used as object data */ #define OB_DATA_SUPPORT_ID(_id_type) \ (ELEM(_id_type, ID_ME, ID_CU, ID_MB, ID_LA, ID_SPK, ID_CA, ID_LT, ID_AR)) |