[Bf-blender-cvs] [5600296c9dd] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Sat Jun 16 15:29:56 CEST 2018


Commit: 5600296c9dd134073b31b0d2cde2dc47e5ad1d60
Author: Campbell Barton
Date:   Sat Jun 16 15:28:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5600296c9dd134073b31b0d2cde2dc47e5ad1d60

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc intern/cycles/blender/blender_session.cpp
index 8e76a4c0061,00d23b9095e..eec13d04d7d
--- a/intern/cycles/blender/blender_session.cpp
+++ b/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());



More information about the Bf-blender-cvs mailing list