Merging r49834 through r49839 from trunk into soc-2011-tomato
[blender.git] / source / blender / makesdna / DNA_space_types.h
index b828247c816f5b26a508a8753d0127da7c332296..89a027cbcfbdf948e055eaaf50b36dacbf529dd6 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "DNA_defs.h"
 #include "DNA_listBase.h"
-#include "DNA_color_types.h"        /* for Histogram */
+#include "DNA_color_types.h"        /* for Histogram and color management */
 #include "DNA_vec_types.h"
 #include "DNA_outliner_types.h"     /* for TreeStoreElem */
 #include "DNA_image_types.h"        /* ImageUser */
@@ -473,6 +473,9 @@ typedef struct SpaceSeq {
        int overlay_type;
 
        struct bGPdata *gpd;        /* grease-pencil data */
+
+       /* **** color management **** */
+       ColorManagedViewSettings view_settings;
 } SpaceSeq;
 
 
@@ -708,6 +711,9 @@ typedef struct SpaceImage {
        char around;
 
        MaskSpaceInfo mask_info;
+
+       /* **** color management **** */
+       ColorManagedViewSettings view_settings;
 } SpaceImage;
 
 
@@ -897,6 +903,9 @@ typedef struct SpaceNode {
        ListBase linkdrag;  /* temporary data for modal linking operator */
        
        struct bGPdata *gpd;        /* grease-pencil data */
+
+       /* **** color management **** */
+       ColorManagedViewSettings view_settings;
 } SpaceNode;
 
 /* snode->flag */
@@ -1040,6 +1049,9 @@ typedef struct SpaceClip {
        int around, pad4;             /* pivot point for transforms */
 
        MaskSpaceInfo mask_info;
+
+       /* **** color management **** */
+       ColorManagedViewSettings view_settings;
 } SpaceClip;
 
 /* SpaceClip->flag */