Fix for own mistake: arc diff swallowed a commit somehow, breaking
[blender.git] / source / blender / makesdna / DNA_color_types.h
index f2702980bb7501cf685a934a9bd27e0caaf1d779..e37311296321cefddfd5b2c20f28c9b67e603d90 100644 (file)
@@ -60,7 +60,10 @@ typedef struct CurveMap {
        float ext_in[2], ext_out[2];    /* for extrapolated curves, the direction vector */
        CurveMapPoint *curve;                   /* actual curve */
        CurveMapPoint *table;                   /* display and evaluate 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 */
        CurveMapPoint *premultable;             /* for RGB curves, premulled table */
+       float premul_ext_in[2];                 /* for RGB curves, premulled extrapolation vector */
+       float premul_ext_out[2];
 } CurveMap;
 
 /* cuma->flag */
 } CurveMap;
 
 /* cuma->flag */
@@ -161,24 +164,26 @@ 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 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 */
        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 */
+       void *pad2;
 } 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 ColorManagedColorspaceSettings {
 typedef struct ColorManagedDisplaySettings {
        char display_device[64];
 } ColorManagedDisplaySettings;
 
 typedef struct ColorManagedColorspaceSettings {
-       char name[64];
+       char name[64];    /* MAX_COLORSPACE_NAME */
 } ColorManagedColorspaceSettings;
 
 } ColorManagedColorspaceSettings;
 
-#endif
+/* ColorManagedViewSettings->flag */
+enum {
+       COLORMANAGE_VIEW_USE_CURVES = (1 << 0)
+};
 
 
+#endif