Color Management, Stage 2: Switch color pipeline to use OpenColorIO
[blender.git] / source / blender / compositor / intern / COM_compositor.cpp
index cb9166c929d149b98f60e00eadb43de72a06d57e..5cfcd83f8f15926a6c4f3f3e4bc2243332cd567c 100644 (file)
@@ -42,7 +42,9 @@ void intern_freeCompositorCaches()
        deintializeDistortionCache();
 }
 
-void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering)
+void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering,
+                 const ColorManagedViewSettings *viewSettings,
+                 const ColorManagedDisplaySettings *displaySettings)
 {
        /* initialize mutex, TODO this mutex init is actually not thread safe and
         * should be done somewhere as part of blender startup, all the other
@@ -71,7 +73,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering)
        bool twopass = (editingtree->flag & NTREE_TWO_PASS) > 0 && !rendering;
        /* initialize execution system */
        if (twopass) {
-               ExecutionSystem *system = new ExecutionSystem(rd, editingtree, rendering, twopass);
+               ExecutionSystem *system = new ExecutionSystem(rd, editingtree, rendering, twopass, viewSettings, displaySettings);
                system->execute();
                delete system;
                
@@ -84,7 +86,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering)
        }
 
        
-       ExecutionSystem *system = new ExecutionSystem(rd, editingtree, rendering, false);
+       ExecutionSystem *system = new ExecutionSystem(rd, editingtree, rendering, false, viewSettings, displaySettings);
        system->execute();
        delete system;