[Bf-blender-cvs] [e17430d00da] upstream_cycles_texture_cache: Cycles: Fixed broken displacement

[Stefan Werner]

Commit: e17430d00dae2aba17a5bf257822885fd190cec4
Author: Stefan Werner
Date:   Tue Sep 19 21:49:19 2017 +0200
Branches: upstream_cycles_texture_cache
https://developer.blender.org/rBe17430d00dae2aba17a5bf257822885fd190cec4

Cycles: Fixed broken displacement

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

M	intern/cycles/kernel/kernel_shader.h

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

diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 5a27913d4c3..13de4ded432 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -451,11 +451,18 @@ ccl_device void shader_setup_from_displace(KernelGlobals *kg, ShaderData *sd,
 	/* force smooth shading for displacement */
 	shader |= SHADER_SMOOTH_NORMAL;
 
+#if 0
+	/* TODO Stefan - need differentials here that don't break the unfiltered case */
 	I = -Ng;
 	differential3 dI = differential3_zero();
 
 	shader_setup_from_sample(kg, sd,
 	                         P, Ng, I, &dI,
+#else
+	
+	shader_setup_from_sample(kg, sd,
+	                         P, Ng, I, NULL,
+#endif
 	                         shader, object, prim,
 	                         u, v, 0.0f, 0.5f,
 	                         !(kernel_tex_fetch(__object_flag, object) & SD_OBJECT_TRANSFORM_APPLIED),