[Bf-blender-cvs] [4c60aae] master: Cleanup: warnings

Campbell Barton noreply at git.blender.org
Mon Oct 6 23:21:44 CEST 2014


Commit: 4c60aae66c773f784854bec40029dc7fc2fe0e14
Author: Campbell Barton
Date:   Mon Oct 6 23:18:47 2014 +0200
Branches: master
https://developer.blender.org/rB4c60aae66c773f784854bec40029dc7fc2fe0e14

Cleanup: warnings

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

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 d124ce4..c03229f 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -373,7 +373,6 @@ ccl_device void kernel_path_subsurface_update_volume_stack(KernelGlobals *kg,
 
 	Ray volume_ray = *ray;
 	Intersection isect;
-	const float3 Pend = volume_ray.P + volume_ray.D*volume_ray.t;
 
 	while(scene_intersect_volume(kg, &volume_ray, &isect))
 	{
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 0100a5b..93cb4c1 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -976,7 +976,6 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg,
 		return;
 	}
 
-	const float3 Pend = ray->P + ray->D*ray->t;
 	Ray volume_ray = *ray;
 	volume_ray.t = FLT_MAX;




More information about the Bf-blender-cvs mailing list