Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jun 2018 13:28:57 +0000 (15:28 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jun 2018 13:28:57 +0000 (15:28 +0200)
intern/cycles/blender/blender_session.cpp

index 8e76a4c..eec13d0 100644 (file)
@@ -141,10 +141,6 @@ void BlenderSession::create_session()
        scene->image_manager->builtin_image_pixels_cb = function_bind(&BlenderSession::builtin_image_pixels, this, _1, _2, _3, _4, _5);
        scene->image_manager->builtin_image_float_pixels_cb = function_bind(&BlenderSession::builtin_image_float_pixels, this, _1, _2, _3, _4, _5);
 
-#ifdef WITH_OCIO
-       scene->film->set_color_config(OCIO_getCurrentConfig());
-#endif
-
        session->scene = scene;
 
        /* There is no single depsgraph to use for the entire render.