diff options
author | Antonioya <blendergit@gmail.com> | 2018-12-14 18:45:57 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2018-12-14 18:52:12 +0300 |
commit | 780f0f646da1aac01dc3164fd7d493426aca9e19 (patch) | |
tree | 453cb60e732399e22279e8eee7a1c9725416c427 /source/blender/editors/object/object_modes.c | |
parent | a1c8595b090254c1270bb66118304186a3add913 (diff) |
GP: Rename CTX and OB modes
Part of T59335.
Diffstat (limited to 'source/blender/editors/object/object_modes.c')
-rw-r--r-- | source/blender/editors/object/object_modes.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c index 4c625a4d33c..771bbc5c18c 100644 --- a/source/blender/editors/object/object_modes.c +++ b/source/blender/editors/object/object_modes.c @@ -74,13 +74,13 @@ static const char *object_mode_op_string(eObjectMode mode) return "PARTICLE_OT_particle_edit_toggle"; if (mode == OB_MODE_POSE) return "OBJECT_OT_posemode_toggle"; - if (mode == OB_MODE_GPENCIL_EDIT) + if (mode == OB_MODE_EDIT_GPENCIL) return "GPENCIL_OT_editmode_toggle"; - if (mode == OB_MODE_GPENCIL_PAINT) + if (mode == OB_MODE_PAINT_GPENCIL) return "GPENCIL_OT_paintmode_toggle"; - if (mode == OB_MODE_GPENCIL_SCULPT) + if (mode == OB_MODE_SCULPT_GPENCIL) return "GPENCIL_OT_sculptmode_toggle"; - if (mode == OB_MODE_GPENCIL_WEIGHT) + if (mode == OB_MODE_WEIGHT_GPENCIL) return "GPENCIL_OT_weightmode_toggle"; return NULL; } @@ -119,8 +119,8 @@ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode) return true; break; case OB_GPENCIL: - if (mode & (OB_MODE_EDIT | OB_MODE_GPENCIL_EDIT | OB_MODE_GPENCIL_PAINT | - OB_MODE_GPENCIL_SCULPT | OB_MODE_GPENCIL_WEIGHT)) + if (mode & (OB_MODE_EDIT | OB_MODE_EDIT_GPENCIL | OB_MODE_PAINT_GPENCIL | + OB_MODE_SCULPT_GPENCIL | OB_MODE_WEIGHT_GPENCIL)) { return true; } |