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:
authorCampbell Barton <ideasman42@gmail.com>2019-01-14 08:30:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-14 08:30:43 +0300
commitf91b21f85bdc10c3ad31e9b3cacbd912bc6517c2 (patch)
tree5618d161ab6780ff60dffc98770bcbf790e0f00d /source/blender/makesdna/DNA_image_types.h
parenta1d73d03eb91be72b0f10ff4a9c6eb00f04b97c6 (diff)
Cleanup: move comments above definitions
For clang-format not to wrap definitions.
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
-rw-r--r--source/blender/makesdna/DNA_image_types.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index e6efe8f25c9..2ca5856796c 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -185,7 +185,8 @@ enum {
IMA_OLD_PREMUL = (1 << 7),
IMA_FLAG_DEPRECATED_8 = (1 << 8), /* cleared */
IMA_USED_FOR_RENDER = (1 << 9),
- IMA_USER_FRAME_IN_RANGE = (1 << 10), /* for image user, but these flags are mixed */
+ /** For image user, but these flags are mixed. */
+ IMA_USER_FRAME_IN_RANGE = (1 << 10),
IMA_VIEW_AS_RENDER = (1 << 11),
IMA_IGNORE_ALPHA = (1 << 12),
IMA_DEINTERLACE = (1 << 13),
@@ -195,14 +196,18 @@ enum {
};
/* Image.tpageflag */
-#define IMA_TPAGEFLAG_DEPRECATED_0 (1 << 0) /* cleared */
-#define IMA_TPAGEFLAG_DEPRECATED_1 (1 << 1) /* cleared */
-#define IMA_TPAGEFLAG_DEPRECATED_2 (1 << 2) /* cleared */
-#define IMA_MIPMAP_COMPLETE (1 << 3) /* all mipmap levels in OpenGL texture set? */
-#define IMA_TPAGEFLAG_DEPRECATED_4 (1 << 4) /* cleared */
-#define IMA_TPAGEFLAG_DEPRECATED_5 (1 << 5) /* cleared */
-#define IMA_TPAGE_REFRESH (1 << 6)
-#define IMA_GLBIND_IS_DATA (1 << 7) /* opengl image texture bound as non-color data */
+enum {
+ IMA_TPAGEFLAG_DEPRECATED_0 = (1 << 0), /* cleared */
+ IMA_TPAGEFLAG_DEPRECATED_1 = (1 << 1), /* cleared */
+ IMA_TPAGEFLAG_DEPRECATED_2 = (1 << 2), /* cleared */
+ /** All mipmap levels in OpenGL texture set? */
+ IMA_MIPMAP_COMPLETE = (1 << 3),
+ IMA_TPAGEFLAG_DEPRECATED_4 = (1 << 4), /* cleared */
+ IMA_TPAGEFLAG_DEPRECATED_5 = (1 << 5), /* cleared */
+ IMA_TPAGE_REFRESH = (1 << 6),
+ /** OpenGL image texture bound as non-color data. */
+ IMA_GLBIND_IS_DATA = (1 << 7),
+};
/* ima->type and ima->source moved to BKE_image.h, for API */