[Bf-blender-cvs] [dc4014c6763] master: Cleanup: Enum for mask overlay mode
Jeroen Bakker
noreply at git.blender.org
Tue Jan 5 10:13:03 CET 2021
Commit: dc4014c6763e1e1fb21a5bbe3ec063166ad2ec80
Author: Jeroen Bakker
Date: Tue Jan 5 10:12:22 2021 +0100
Branches: master
https://developer.blender.org/rBdc4014c6763e1e1fb21a5bbe3ec063166ad2ec80
Cleanup: Enum for mask overlay mode
===================================================================
M source/blender/editors/include/ED_mask.h
M source/blender/editors/mask/mask_draw.c
M source/blender/makesdna/DNA_mask_types.h
===================================================================
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 {
More information about the Bf-blender-cvs
mailing list