From 088157e44748d9466297597be46c49314e4e7242 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 20 Jun 2022 11:25:38 +0200 Subject: Cleanup: Add description of more mask editing poll functions No functional changes. --- source/blender/editors/include/ED_image.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source/blender/editors/include/ED_image.h') diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index b16844c01ea..888bf0d86c5 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -137,8 +137,22 @@ bool ED_space_image_paint_curve(const struct bContext *C); * Matches clip function. */ bool ED_space_image_check_show_maskedit(struct SpaceImage *sima, struct Object *obedit); + +/* Returns true when the following conditions are met: + * - Current space is Image Editor. + * - The image editor is not an UV Editor. + * - It is set to Mask mode. + * + * It is not required to have mask opened for editing. */ bool ED_space_image_maskedit_poll(struct bContext *C); + +/* Returns true when the following conditions are met: + * - Current space is Image Editor. + * - The image editor is not an UV Editor. + * - It is set to Mask mode. + * - The space has mask opened. */ bool ED_space_image_maskedit_mask_poll(struct bContext *C); + bool ED_space_image_cursor_poll(struct bContext *C); /** -- cgit v1.2.3 From 9f8cc1bc349cb3e48af71e95b60693dfccfe2c82 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 20 Jun 2022 10:14:00 -0500 Subject: Cleanup: Grammar: a vs an --- source/blender/editors/include/ED_image.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/include/ED_image.h') diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index 888bf0d86c5..3e5d4c3adf4 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -140,7 +140,7 @@ bool ED_space_image_check_show_maskedit(struct SpaceImage *sima, struct Object * /* Returns true when the following conditions are met: * - Current space is Image Editor. - * - The image editor is not an UV Editor. + * - The image editor is not a UV Editor. * - It is set to Mask mode. * * It is not required to have mask opened for editing. */ @@ -148,7 +148,7 @@ bool ED_space_image_maskedit_poll(struct bContext *C); /* Returns true when the following conditions are met: * - Current space is Image Editor. - * - The image editor is not an UV Editor. + * - The image editor is not a UV Editor. * - It is set to Mask mode. * - The space has mask opened. */ bool ED_space_image_maskedit_mask_poll(struct bContext *C); -- cgit v1.2.3 From df2ab4e758c73bc72a95fcc02ac1e711bbd86b17 Mon Sep 17 00:00:00 2001 From: Simon Lenz Date: Thu, 16 Jun 2022 10:13:03 +0200 Subject: Mask Editor: Add toggle for mask spline drawing Adds an overlay option to show/hide the spline points & lines of masks in the Mask Editor. It also moves the "smooth" option up (its position left of the selection dropdown was missleading). {F11847272} This emerged from a discussion in https://developer.blender.org/D12776 Differential Revision: https://developer.blender.org/D13314 --- source/blender/editors/include/ED_image.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'source/blender/editors/include/ED_image.h') diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index 3e5d4c3adf4..91ae8286531 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -150,9 +150,26 @@ bool ED_space_image_maskedit_poll(struct bContext *C); * - Current space is Image Editor. * - The image editor is not a UV Editor. * - It is set to Mask mode. + * - Mask has visible and editable splines. + * + * It is not required to have mask opened for editing. */ +bool ED_space_image_maskedit_visible_splines_poll(struct bContext *C); + +/* Returns true when the following conditions are met: + * - Current space is Image Editor. + * - The image editor is not an UV Editor. + * - It is set to Mask mode. * - The space has mask opened. */ bool ED_space_image_maskedit_mask_poll(struct bContext *C); +/* Returns true when the following conditions are met: + * - Current space is Image Editor. + * - The image editor is not an UV Editor. + * - It is set to Mask mode. + * - The space has mask opened. + * - Mask has visible and editable splines. */ +bool ED_space_image_maskedit_mask_visible_splines_poll(struct bContext *C); + bool ED_space_image_cursor_poll(struct bContext *C); /** -- cgit v1.2.3