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-07 14:19:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-07 16:43:00 +0300
commit5a43406e1bad973a8cb32702b4fdb588068a6dcd (patch)
treeb47ac75f429b586950dab5300669c373023efab8 /source/blender/makesdna/DNA_color_types.h
parent0215caeac2ad013fa03e2799049f5358d951ebfa (diff)
Cleanup: move DNA comments before struct members
Needed for clang-format in some cases, see: T53211
Diffstat (limited to 'source/blender/makesdna/DNA_color_types.h')
-rw-r--r--source/blender/makesdna/DNA_color_types.h62
1 files changed, 41 insertions, 21 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index 2c6411ad375..c9a91a54eb3 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -43,7 +43,8 @@
typedef struct CurveMapPoint {
float x, y;
- short flag, shorty; /* shorty for result lookup */
+ /** Shorty for result lookup. */
+ short flag, shorty;
} CurveMapPoint;
/* curvepoint->flag */
@@ -56,14 +57,21 @@ enum {
typedef struct CurveMap {
short totpoint, flag;
- float range; /* quick multiply value for reading table */
- float mintable, maxtable; /* the x-axis range for the table */
- float ext_in[2], ext_out[2]; /* for extrapolated curves, the direction vector */
- CurveMapPoint *curve; /* actual curve */
- CurveMapPoint *table; /* display and evaluate table */
-
- CurveMapPoint *premultable; /* for RGB curves, premulled table */
- float premul_ext_in[2]; /* for RGB curves, premulled extrapolation vector */
+ /** Quick multiply value for reading table. */
+ float range;
+ /** The x-axis range for the table. */
+ float mintable, maxtable;
+ /** For extrapolated curves, the direction vector. */
+ float ext_in[2], ext_out[2];
+ /** Actual curve. */
+ CurveMapPoint *curve;
+ /** Display and evaluate table. */
+ CurveMapPoint *table;
+
+ /** For RGB curves, premulled table. */
+ CurveMapPoint *premultable;
+ /** For RGB curves, premulled extrapolation vector. */
+ float premul_ext_in[2];
float premul_ext_out[2];
} CurveMap;
@@ -71,17 +79,23 @@ typedef struct CurveMap {
#define CUMA_EXTEND_EXTRAPOLATE 1
typedef struct CurveMapping {
- int flag, cur; /* cur; for buttons, to show active curve */
+ /** Cur; for buttons, to show active curve. */
+ int flag, cur;
int preset;
int changed_timestamp;
- rctf curr, clipr; /* current rect, clip rect (is default rect too) */
+ /** Current rect, clip rect (is default rect too). */
+ rctf curr, clipr;
- CurveMap cm[4]; /* max 4 builtin curves per mapping struct now */
- float black[3], white[3]; /* black/white point (black[0] abused for current frame) */
- float bwmul[3]; /* black/white point multiply value, for speed */
+ /** Max 4 builtin curves per mapping struct now. */
+ CurveMap cm[4];
+ /** Black/white point (black[0] abused for current frame). */
+ float black[3], white[3];
+ /** Black/white point multiply value, for speed. */
+ float bwmul[3];
- float sample[3]; /* sample values, if flag set it draws line and intersection */
+ /** Sample values, if flag set it draws line and intersection. */
+ float sample[3];
short tone;
short pad[3];
@@ -177,11 +191,16 @@ typedef struct Scopes {
typedef struct ColorManagedViewSettings {
int flag, pad;
- char look[64]; /* look which is being applied when displaying buffer on the screen (prior to view transform) */
- char view_transform[64]; /* view transform which is being applied when displaying buffer on the screen */
- float exposure; /* fstop exposure */
- float gamma; /* post-display gamma transform */
- struct CurveMapping *curve_mapping; /* pre-display RGB curves transform */
+ /** Look which is being applied when displaying buffer on the screen (prior to view transform). */
+ char look[64];
+ /** View transform which is being applied when displaying buffer on the screen. */
+ char view_transform[64];
+ /** Fstop exposure. */
+ float exposure;
+ /** Post-display gamma transform. */
+ float gamma;
+ /** Pre-display RGB curves transform. */
+ struct CurveMapping *curve_mapping;
void *pad2;
} ColorManagedViewSettings;
@@ -190,7 +209,8 @@ typedef struct ColorManagedDisplaySettings {
} ColorManagedDisplaySettings;
typedef struct ColorManagedColorspaceSettings {
- char name[64]; /* MAX_COLORSPACE_NAME */
+ /** MAX_COLORSPACE_NAME. */
+ char name[64];
} ColorManagedColorspaceSettings;
/* ColorManagedViewSettings->flag */