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

Stefan Werner noreply at git.blender.org
Wed Mar 13 14:09:08 CET 2019


Commit: 7be7f1a884cd08e49abc34c41e53b276cd46068b
Author: Stefan Werner
Date:   Wed Mar 13 14:08:28 2019 +0100
Branches: cycles_texture_cache
https://developer.blender.org/rB7be7f1a884cd08e49abc34c41e53b276cd46068b

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

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



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

diff --cc intern/cycles/blender/addon/ui.py
index 56a5b612dd0,e0de3031466..0ffa44fb0c2
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@@ -2131,8 -2161,8 +2195,9 @@@ classes = 
      CYCLES_RENDER_PT_performance_acceleration_structure,
      CYCLES_RENDER_PT_performance_final_render,
      CYCLES_RENDER_PT_performance_viewport,
 +    CYCLES_RENDER_PT_texture_cache,
      CYCLES_RENDER_PT_filter,
+     CYCLES_RENDER_PT_override,
      CYCLES_RENDER_PT_passes,
      CYCLES_RENDER_PT_passes_data,
      CYCLES_RENDER_PT_passes_light,
diff --cc intern/cycles/blender/blender_python.cpp
index 7af43634db2,4a1eeeb65c1..db9a6b8e7c1
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@@ -788,8 -911,7 +927,8 @@@ static PyMethodDef methods[] = 
  	{"osl_update_node", osl_update_node_func, METH_VARARGS, ""},
  	{"osl_compile", osl_compile_func, METH_VARARGS, ""},
  #endif
 +	{"oiio_make_tx", oiio_make_tx, METH_VARARGS, ""},
- 	{"available_devices", available_devices_func, METH_NOARGS, ""},
+ 	{"available_devices", available_devices_func, METH_VARARGS, ""},
  	{"system_info", system_info_func, METH_NOARGS, ""},
  #ifdef WITH_OPENCL
  	{"opencl_disable", opencl_disable_func, METH_NOARGS, ""},
diff --cc intern/cycles/kernel/kernel_bake.h
index e30aaf353ce,920b10086c5..35c62792d85
--- a/intern/cycles/kernel/kernel_bake.h
+++ b/intern/cycles/kernel/kernel_bake.h
@@@ -299,9 -297,10 +297,10 @@@ ccl_device void kernel_bake_evaluate(Ke
  
  	/* light passes */
  	PathRadiance L;
+ 	path_radiance_init(&L, kernel_data.film.use_light_pass);
  
  	shader_setup_from_sample(kg, &sd,
 -	                         P, Ng, Ng,
 +	                         P, Ng, Ng, NULL,
  	                         shader, object, prim,
  	                         u, v, 1.0f, 0.5f,
  	                         !(kernel_tex_fetch(__object_flag, object) & SD_OBJECT_TRANSFORM_APPLIED),



More information about the Bf-blender-cvs mailing list