[Bf-blender-cvs] [96da223] openvdb: Quiet some warnings.

Kévin Dietrich noreply at git.blender.org
Fri Jan 29 21:39:51 CET 2016


Commit: 96da223d0b0082bcbc104c93d7d6ee90cbb7b2ca
Author: Kévin Dietrich
Date:   Fri Jan 29 21:39:19 2016 +0100
Branches: openvdb
https://developer.blender.org/rB96da223d0b0082bcbc104c93d7d6ee90cbb7b2ca

Quiet some warnings.

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

M	intern/cycles/kernel/kernel_volume.h

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

diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index bf77cc0..43dd1b2 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -497,7 +497,7 @@ ccl_device_inline VolumeIntegrateResult kernel_volume_integrate_ray(
 	if(volume_shader_sample(kg, sd, state, new_P, &coeff)) {
 		int closure_flag = sd->flag;
 		float3 new_tp;
-		float3 transmittance;
+		float3 transmittance = make_float3(1.0f, 1.0f, 1.0f);
 		bool scatter = false;
 
 		/* distance sampling */
@@ -761,7 +761,7 @@ ccl_device void kernel_volume_decoupled_record(KernelGlobals *kg, PathState *sta
 	float3 accum_emission = make_float3(0.0f, 0.0f, 0.0f);
 	float3 accum_transmittance = make_float3(1.0f, 1.0f, 1.0f);
 	float3 cdf_distance = make_float3(0.0f, 0.0f, 0.0f);
-	float t = 0.0f, t1 = 0.0f;
+	float t = 0.0f;
 
 	segment->numsteps = 0;
 	segment->closure_flag = 0;
@@ -771,6 +771,7 @@ ccl_device void kernel_volume_decoupled_record(KernelGlobals *kg, PathState *sta
 #ifdef __OPENVDB__
 	int vdb_index = kernel_data.tables.density_index;
 	bool has_vdb_volume = kernel_data.tables.num_volumes > 0;
+	float t1 = 0.0f;
 
 	if(has_vdb_volume && kg->float_volumes[vdb_index]->has_uniform_voxels()) {
 		/* TODO(kevin): this call should be moved out of here, all it does is




More information about the Bf-blender-cvs mailing list