sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: Fix some typos in the code.

Browse Source
This commit is contained in:
Thomas Dinges 2014-03-01 01:21:25 +01:00
parent 1582dd5e4d
commit 76a7c2173b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_python.cpp
View File

@ -493,7 +493,7 @@ void *CCL_python_module_init()
/* TODO(sergey): This gives us library we've been linking against. /* TODO(sergey): This gives us library we've been linking against.
* In theory with dynamic OSL library it might not be * In theory with dynamic OSL library it might not be
* accurate, but there's nothing in OSL API which we * accurate, but there's nothing in OSL API which we
* might use th get version in runtime. * might use to get version in runtime.
*/ */
int curversion = OSL_LIBRARY_VERSION_CODE; int curversion = OSL_LIBRARY_VERSION_CODE;
PyModule_AddObject(mod, "with_osl", Py_True); PyModule_AddObject(mod, "with_osl", Py_True);

6
intern/cycles/kernel/kernel_volume.h
View File

@ -114,7 +114,7 @@ ccl_device bool volume_stack_is_heterogeneous(KernelGlobals *kg, VolumeStack *st
* These functions are used to attenuate shadow rays to lights. Both absorption * These functions are used to attenuate shadow rays to lights. Both absorption
* and scattering will block light, represented by the extinction coefficient. */ * and scattering will block light, represented by the extinction coefficient. */
/* homogenous volume: assume shader evaluation at the starts gives /* homogeneous volume: assume shader evaluation at the starts gives
* the extinction coefficient for the entire line segment */ * the extinction coefficient for the entire line segment */
ccl_device void kernel_volume_shadow_homogeneous(KernelGlobals *kg, PathState *state, Ray *ray, ShaderData *sd, float3 *throughput) ccl_device void kernel_volume_shadow_homogeneous(KernelGlobals *kg, PathState *state, Ray *ray, ShaderData *sd, float3 *throughput)
{ {
@ -192,7 +192,7 @@ ccl_device_noinline void kernel_volume_shadow(KernelGlobals *kg, PathState *stat
/* Volume Path */ /* Volume Path */
/* homogenous volume: assume shader evaluation at the starts gives /* homogeneous volume: assume shader evaluation at the start gives
* the volume shading coefficient for the entire line segment */ * the volume shading coefficient for the entire line segment */
ccl_device VolumeIntegrateResult kernel_volume_integrate_homogeneous(KernelGlobals *kg, ccl_device VolumeIntegrateResult kernel_volume_integrate_homogeneous(KernelGlobals *kg,
PathState *state, Ray *ray, ShaderData *sd, PathRadiance *L, float3 *throughput, PathState *state, Ray *ray, ShaderData *sd, PathRadiance *L, float3 *throughput,
@ -431,7 +431,7 @@ ccl_device VolumeIntegrateResult kernel_volume_integrate_heterogeneous(KernelGlo
accum_sigma_s = (accum_sigma_s + dt*sigma_s)/new_t; accum_sigma_s = (accum_sigma_s + dt*sigma_s)/new_t;
/* todo: it's not clear to me that this is correct if we move /* todo: it's not clear to me that this is correct if we move
* through a color volumed, needs verification */ * through a color volume, needs verification */
float pdf = dot(accum_sigma_t, accum_transmittance); float pdf = dot(accum_sigma_t, accum_transmittance);
new_tp = tp * accum_sigma_s * transmittance * (3.0f / pdf); new_tp = tp * accum_sigma_s * transmittance * (3.0f / pdf);