Merge branch 'master' into blende2.8
[blender.git] / source / blender / makesdna / DNA_color_types.h
index 1c9b6278c7368fa7a106740f4d9d194a17bec33d..2c6411ad375d0fff992c5365cdd0f5c8c3375067 100644 (file)
@@ -82,6 +82,9 @@ typedef struct CurveMapping {
        float bwmul[3];                                 /* black/white point multiply value, for speed */
 
        float sample[3];                                /* sample values, if flag set it draws line and intersection */
+
+       short tone;
+       short pad[3];
 } CurveMapping;
 
 /* cumapping->flag */
@@ -99,8 +102,16 @@ typedef enum eCurveMappingPreset {
        CURVE_PRESET_MID9   = 4,
        CURVE_PRESET_ROUND  = 5,
        CURVE_PRESET_ROOT   = 6,
+       CURVE_PRESET_GAUSS  = 7,
+       CURVE_PRESET_BELL   = 8,
 } eCurveMappingPreset;
 
+/* CurveMapping->tone */
+typedef enum eCurveMappingTone {
+       CURVE_TONE_STANDARD = 0,
+       CURVE_TONE_FILMLIKE = 2,
+} eCurveMappingTone;
+
 /* histogram->mode */
 enum {
        HISTO_MODE_LUMA   = 0,