[Bf-blender-cvs] [36f9a9694d7] cycles_texture_cache: Merge branch 'master' into cycles_texture_cache

[Stefan Werner]

Commit: 36f9a9694d7ba084fd41e61c5f45287eebc56cda
Author: Stefan Werner
Date:   Thu Nov 8 13:15:48 2018 +0100
Branches: cycles_texture_cache
https://developer.blender.org/rB36f9a9694d7ba084fd41e61c5f45287eebc56cda

Merge branch 'master' into cycles_texture_cache

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



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

diff --cc intern/cycles/blender/blender_sync.cpp
index 753788d42c8,832847c179f..357fb357cda
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@@ -730,29 -730,10 +730,32 @@@ SceneParams BlenderSync::get_scene_para
  	else {
  		params.bvh_layout = DebugFlags().cpu.bvh_layout;
  	}
 -
+ #ifdef WITH_EMBREE
+ 	params.bvh_layout = RNA_boolean_get(&cscene, "use_bvh_embree") ? BVH_LAYOUT_EMBREE : params.bvh_layout;
+ #endif
 +
 +	params.texture.use_cache  = RNA_boolean_get(&cscene, "use_texture_cache");
 +	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");
 +	params.texture.use_custom_cache_path  = RNA_boolean_get(&cscene, "use_custom_cache_path");
 +	if(params.texture.use_custom_cache_path) {
 +		char *path = RNA_string_get_alloc(&cscene, "custom_cache_path", NULL, 0);
 +		if(path) {
 +			params.texture.custom_cache_path = path;
 +			MEM_freeN(path);
 +		}
 +	}
 +	else {
 +		params.texture.custom_cache_path.clear();
 +	}
- 	
++
  	return params;
  }
  
diff --cc intern/cycles/render/scene.h
index 49854641302,543feedf72f..36bcd39dfa9
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@@ -203,10 -166,8 +203,9 @@@ public
  	bool use_bvh_spatial_split;
  	bool use_bvh_unaligned_nodes;
  	int num_bvh_time_steps;
- 
  	bool persistent_data;
  	int texture_limit;
 +	TextureCacheParams texture;
  
  	SceneParams()
  	{