Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2021-01-05 12:12:22 +0300
committerJeroen Bakker <jeroen@blender.org>2021-01-05 12:13:00 +0300
commitdc4014c6763e1e1fb21a5bbe3ec063166ad2ec80 (patch)
tree72f43bc6bfc8ea87e4c36ecd306050ef25c0b75d
parent7d152bedc5f172d77915d1377f0a8ca3a627e583 (diff)
Cleanup: Enum for mask overlay mode
-rw-r--r--source/blender/editors/include/ED_mask.h4
-rw-r--r--source/blender/editors/mask/mask_draw.c2
-rw-r--r--source/blender/makesdna/DNA_mask_types.h4
3 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h
index f683495608a..bcf52da3f69 100644
--- a/source/blender/editors/include/ED_mask.h
+++ b/source/blender/editors/include/ED_mask.h
@@ -27,6 +27,8 @@
extern "C" {
#endif
+#include "DNA_mask_types.h"
+
struct Depsgraph;
struct KeyframeEditData;
struct MaskLayer;
@@ -70,7 +72,7 @@ void ED_mask_draw_region(struct Depsgraph *depsgraph,
struct ARegion *region,
const char draw_flag,
const char draw_type,
- const char overlay_mode,
+ const eMaskOverlayMode overlay_mode,
const int width_i,
const int height_i,
const float aspx,
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index c757b6f0cc3..89fd2fa9b62 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -674,7 +674,7 @@ void ED_mask_draw_region(
ARegion *region,
const char draw_flag,
const char draw_type,
- const char overlay_mode,
+ const eMaskOverlayMode overlay_mode,
/* convert directly into aspect corrected vars */
const int width_i,
const int height_i,
diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h
index 296f5bceb81..79ac655300e 100644
--- a/source/blender/makesdna/DNA_mask_types.h
+++ b/source/blender/makesdna/DNA_mask_types.h
@@ -225,10 +225,10 @@ enum {
};
/* MaskSpaceInfo->overlay_mode */
-enum {
+typedef enum eMaskOverlayMode {
MASK_OVERLAY_ALPHACHANNEL = 0,
MASK_OVERLAY_COMBINED = 1,
-};
+} eMaskOverlayMode;
/* masklay->blend */
enum {