diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-16 16:28:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-16 16:28:57 +0300 |
| commit | 5600296c9dd134073b31b0d2cde2dc47e5ad1d60 (patch) | |
| tree | 475a9c04c7336b4078485c2375111f49845819cd /intern | |
| parent | 9d876960e8914bfa11bc3be1e500832711c20350 (diff) | |
| parent | b955747875426c68c43e1f8bc7e4f2792f5bb22f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 8e76a4c0061..eec13d04d7d 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -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. |