[Bf-blender-cvs] [60da3f4ca61] cycles_texture_cache: Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

[Stefan Werner]

Commit: 60da3f4ca61bc377f787e9c0436bf9e3079ba474
Author: Stefan Werner
Date:   Mon Sep 17 12:39:25 2018 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rB60da3f4ca61bc377f787e9c0436bf9e3079ba474

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

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



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

diff --cc intern/cycles/blender/blender_sync.cpp
index 33e3877f3a2,5e47252e336..6332d2b2c4f
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@@ -662,18 -679,16 +679,26 @@@ SceneParams BlenderSync::get_scene_para
  		params.texture_limit = 0;
  	}
  
- 	params.bvh_layout = DebugFlags().cpu.bvh_layout;
+ 	/* TODO(sergey): Once OSL supports per-microarchitecture optimization get
+ 	 * rid of this.
+ 	 */
+ 	if(params.shadingsystem == SHADINGSYSTEM_OSL) {
+ 		params.bvh_layout = BVH_LAYOUT_BVH4;
+ 	}
+ 	else {
+ 		params.bvh_layout = DebugFlags().cpu.bvh_layout;
+ 	}
  
 +	params.texture.cache_size = RNA_int_get(&cscene, "texture_cache_size");
 +	params.texture.auto_convert = RNA_boolean_get(&cscene, "texture_auto_convert");
 +	params.texture.accept_unmipped = RNA_boolean_get(&cscene, "texture_accept_unmipped");
 +	params.texture.accept_untiled = RNA_boolean_get(&cscene, "texture_accept_untiled");
 +	params.texture.tile_size = RNA_int_get(&cscene, "texture_tile_size");
 +	params.texture.auto_mip = RNA_boolean_get(&cscene, "texture_auto_mip");
 +	params.texture.auto_tile = RNA_boolean_get(&cscene, "texture_auto_tile");
 +	params.texture.diffuse_blur = RNA_float_get(&cscene, "texture_blur_diffuse");
 +	params.texture.glossy_blur = RNA_float_get(&cscene, "texture_blur_glossy");
 +	
  	return params;
  }