[Bf-blender-cvs] [21825c4] master: Cycles: Avoid temp variable in camera-in-volume check

Sergey Sharybin noreply at git.blender.org
Sat Sep 27 22:36:21 CEST 2014


Commit: 21825c4359159798da2b0b25da8ef1131c7399d1
Author: Sergey Sharybin
Date:   Sun Sep 28 02:35:37 2014 +0600
Branches: master
https://developer.blender.org/rB21825c4359159798da2b0b25da8ef1131c7399d1

Cycles: Avoid temp variable in camera-in-volume check

Was a left-over from some experiments, no need it with the current
implementation, and likely wouldn't need in the future.

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

M	intern/cycles/kernel/kernel_path.h
M	intern/cycles/kernel/kernel_volume.h

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

diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index 5cd4504..29077a8 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -371,7 +371,7 @@ 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
+	while(scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY,
 	                      &isect, NULL, 0.0f, 0.0f))
 	{
 		ShaderData sd;
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 1273869..794ce92 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -985,10 +985,9 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg,
 	      enclosed_index < VOLUME_STACK_SIZE - 1)
 	{
 		Intersection isect;
-		bool hit = scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY,
-		                           &isect,
-		                           NULL, 0.0f, 0.0f);
-		if(!hit) {
+		if(!scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY,
+		                    &isect, NULL, 0.0f, 0.0f))
+		{
 			break;
 		}




More information about the Bf-blender-cvs mailing list