Merge branch 'master' into xr-devxr-dev

1 files changed, 7 insertions, 10 deletions

diff --git a/intern/cycles/kernel/svm/bump.h b/intern/cycles/kernel/svm/bump.h
index 566c45f5f25..1009a6a4241 100644
--- a/intern/cycles/kernel/svm/bump.h
+++ b/intern/cycles/kernel/svm/bump.h
@@ -14,23 +14,21 @@ ccl_device_noinline void svm_node_enter_bump_eval(KernelGlobals kg,
 {
   /* save state */
   stack_store_float3(stack, offset + 0, sd->P);
-  stack_store_float3(stack, offset + 3, sd->dP.dx);
-  stack_store_float3(stack, offset + 6, sd->dP.dy);
+  stack_store_float(stack, offset + 3, sd->dP);
 
   /* set state as if undisplaced */
   const AttributeDescriptor desc = find_attribute(kg, sd, ATTR_STD_POSITION_UNDISPLACED);
 
   if (desc.offset != ATTR_STD_NOT_FOUND) {
-    float3 P, dPdx, dPdy;
-    P = primitive_surface_attribute_float3(kg, sd, desc, &dPdx, &dPdy);
+    differential3 dP;
+    float3 P = primitive_surface_attribute_float3(kg, sd, desc, &dP.dx, &dP.dy);
 
     object_position_transform(kg, sd, &P);
-    object_dir_transform(kg, sd, &dPdx);
-    object_dir_transform(kg, sd, &dPdy);
+    object_dir_transform(kg, sd, &dP.dx);
+    object_dir_transform(kg, sd, &dP.dy);
 
     sd->P = P;
-    sd->dP.dx = dPdx;
-    sd->dP.dy = dPdy;
+    sd->dP = differential_make_compact(dP);
   }
 }
 
@@ -41,8 +39,7 @@ ccl_device_noinline void svm_node_leave_bump_eval(KernelGlobals kg,
 {
   /* restore state */
   sd->P = stack_load_float3(stack, offset + 0);
-  sd->dP.dx = stack_load_float3(stack, offset + 3);
-  sd->dP.dy = stack_load_float3(stack, offset + 6);
+  sd->dP = stack_load_float(stack, offset + 3);
 }
 
 CCL_NAMESPACE_END