[Bf-blender-cvs] [7bef25a] cycles_kernel_split: Cycles kernel split: Make it more close to master
Sergey Sharybin
noreply at git.blender.org
Fri May 8 14:18:31 CEST 2015
Commit: 7bef25a5cfaf4969bcd127d2e320d41e35f8e83e
Author: Sergey Sharybin
Date: Fri May 8 17:08:58 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB7bef25a5cfaf4969bcd127d2e320d41e35f8e83e
Cycles kernel split: Make it more close to master
No need to manually inline differential_zero() function, it can be
called without any issues by the looks of it.
===================================================================
M intern/cycles/kernel/kernel_shader.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 8cd281a..c79b7a0 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -387,10 +387,8 @@ ccl_device_inline void shader_setup_from_background(KernelGlobals *kg, ShaderDat
/* differentials */
sd_fetch(dP) = ray->dD;
differential_incoming(&sd_fetch(dI), sd_fetch(dP));
- sd_fetch(du).dx = 0.0f;
- sd_fetch(du).dy = 0.0f;
- sd_fetch(dv).dx = 0.0f;
- sd_fetch(dv).dy = 0.0f;
+ sd_fetch(du) = differential_zero();
+ sd_fetch(dv) = differential_zero();
#endif
}
More information about the Bf-blender-cvs
mailing list