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)
1  2 
intern/cycles/blender/blender_session.cpp

@@@ -141,18 -139,8 +141,14 @@@ 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.
 +       * So we need to handle this differently.
 +       *
 +       * We could loop over the final render result render layers in pipeline and keep Cycles unaware of multiple layers,
 +       * or perhaps move syncing further down in the pipeline.
 +       */
        /* create sync */
        sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress);
        BL::Object b_camera_override(b_engine.camera_override());