[Bf-blender-cvs] [53b05e4] master: Cycles: Cleanup of the SSS volume stack update code

Sergey Sharybin noreply at git.blender.org
Sat Sep 27 22:20:44 CEST 2014


Commit: 53b05e4f06425aa3c20082da454d8114e58d53ed
Author: Sergey Sharybin
Date:   Sun Sep 28 02:19:17 2014 +0600
Branches: master
https://developer.blender.org/rB53b05e4f06425aa3c20082da454d8114e58d53ed

Cycles: Cleanup of the SSS volume stack update code

Was a leftover after the changed scene_intersect() which used to
be ifdefed depending on the __HAIR__ in the original patch.

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

M	intern/cycles/kernel/kernel_path.h

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

diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index b8994d9..5cd4504 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -371,9 +371,9 @@ ccl_device void kernel_path_subsurface_update_volume_stack(KernelGlobals *kg,
 	Intersection isect;
 	const float3 Pend = volume_ray.P + volume_ray.D*volume_ray.t;
 
-	while(
-		scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY,
-		                &isect, NULL, 0.0f, 0.0f)) {
+	while(scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY
+	                      &isect, NULL, 0.0f, 0.0f))
+	{
 		ShaderData sd;
 		shader_setup_from_ray(kg, &sd, &isect, &volume_ray, 0, 0);
 		kernel_volume_stack_enter_exit(kg, &sd, stack);




More information about the Bf-blender-cvs mailing list