[Bf-blender-cvs] [ab2d05d] master: Fix T44269: Typo in volume_attribute_float:geom_volume.h
Sergey Sharybin
noreply at git.blender.org
Sun Apr 5 16:16:30 CEST 2015
Commit: ab2d05d9588fa1d40333f3ab86d54513c6e50dc9
Author: Sergey Sharybin
Date: Sun Apr 5 18:51:54 2015 +0500
Branches: master
https://developer.blender.org/rBab2d05d9588fa1d40333f3ab86d54513c6e50dc9
Fix T44269: Typo in volume_attribute_float:geom_volume.h
Was rather harmless typo since we either pass both dx,dy or pass both NULL.
===================================================================
M intern/cycles/kernel/geom/geom_volume.h
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_volume.h b/intern/cycles/kernel/geom/geom_volume.h
index c33509f..c72afa2 100644
--- a/intern/cycles/kernel/geom/geom_volume.h
+++ b/intern/cycles/kernel/geom/geom_volume.h
@@ -60,7 +60,7 @@ ccl_device float volume_attribute_float(KernelGlobals *kg, const ShaderData *sd,
#endif
if(dx) *dx = 0.0f;
- if(dx) *dy = 0.0f;
+ if(dy) *dy = 0.0f;
/* todo: support float textures to lower memory usage for single floats */
return average(float4_to_float3(r));
More information about the Bf-blender-cvs
mailing list