Color Management, Stage 2: Switch color pipeline to use OpenColorIO
[blender.git] / source / blender / compositor / intern / COM_CompositorContext.cpp
index fbdb4cd6b2810870b6db5d57aea4d4d2a9b2fb03..e1cc25d028aa0ebbf345d011b88e1167c2fb79d2 100644 (file)
@@ -31,6 +31,8 @@ CompositorContext::CompositorContext()
        this->m_hasActiveOpenCLDevices = false;
        this->m_activegNode = NULL;
        this->m_fastCalculation = false;
+       this->m_viewSettings = NULL;
+       this->m_displaySettings = NULL;
 }
 
 const int CompositorContext::getFramenumber() const
@@ -42,13 +44,3 @@ const int CompositorContext::getFramenumber() const
                return -1; /* this should never happen */
        }
 }
-
-const int CompositorContext::isColorManaged() const
-{
-       if (this->m_rd) {
-               return this->m_rd->color_mgt_flag & R_COLOR_MANAGEMENT;
-       }
-       else {
-               return 0; /* this should never happen */
-       }
-}