Color Management: RGB curves transform as a part of display transform
[blender-staging.git] / source / blender / makesdna / DNA_color_types.h
index c386f912636acb6480ef7261de2c1216521eee26..560caa40cff0e7c588fb7e6d8b6b821b44a1fd4d 100644 (file)
@@ -47,8 +47,10 @@ typedef struct CurveMapPoint {
 } CurveMapPoint;
 
 /* curvepoint->flag */
 } CurveMapPoint;
 
 /* curvepoint->flag */
-#define CUMA_SELECT            1
-#define CUMA_VECTOR            2
+enum {
+       CUMA_SELECT = 1,
+       CUMA_VECTOR = 2
+};
 
 typedef struct CurveMap {
        short totpoint, flag;
 
 typedef struct CurveMap {
        short totpoint, flag;
@@ -159,17 +161,13 @@ typedef struct Scopes {
 #define SCOPES_WAVEFRM_YCC_JPEG        4
 
 typedef struct ColorManagedViewSettings {
 #define SCOPES_WAVEFRM_YCC_JPEG        4
 
 typedef struct ColorManagedViewSettings {
-       int flag;                  /* assodted flags such as using global settings from window and so */
+       int flag, pad;
        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 */
        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 */
-       int pad;
+       struct CurveMapping *curve_mapping;  /* pre-display RGB curves transform */
 } ColorManagedViewSettings;
 
 } ColorManagedViewSettings;
 
-enum {
-       COLORMANAGE_VIEW_USE_GLOBAL = (1 << 0)    /* use global display settings instead of per-space setting */
-};
-
 typedef struct ColorManagedDisplaySettings {
        char display_device[64];
 } ColorManagedDisplaySettings;
 typedef struct ColorManagedDisplaySettings {
        char display_device[64];
 } ColorManagedDisplaySettings;
@@ -178,5 +176,9 @@ typedef struct ColorManagedColorspaceSettings {
        char name[64];
 } ColorManagedColorspaceSettings;
 
        char name[64];
 } ColorManagedColorspaceSettings;
 
-#endif
+/* ColorManagedViewSettings->flag */
+enum {
+       COLORMANAGE_VIEW_USE_CURVES = (1 << 0)
+};
 
 
+#endif