diff options
| -rw-r--r-- | intern/cycles/kernel/kernel_accumulate.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_light.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h index ca420909bc7..fb11cbd395f 100644 --- a/intern/cycles/kernel/kernel_accumulate.h +++ b/intern/cycles/kernel/kernel_accumulate.h @@ -286,7 +286,7 @@ __device_inline void path_radiance_sum_indirect(PathRadiance *L) #ifdef __PASSES__ /* this division is a bit ugly, but means we only have to keep track of * only a single throughput further along the path, here we recover just - * the indirect parth that is not influenced by any particular BSDF type */ + * the indirect path that is not influenced by any particular BSDF type */ if(L->use_light_pass) { L->direct_emission = safe_divide_color(L->direct_emission, L->direct_throughput); L->direct_diffuse += L->path_diffuse*L->direct_emission; diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h index 5091eac41db..e25d4c20885 100644 --- a/intern/cycles/kernel/kernel_light.h +++ b/intern/cycles/kernel/kernel_light.h @@ -375,7 +375,7 @@ __device bool lamp_light_eval(KernelGlobals *kg, int lamp, float3 P, float3 D, f ls->pdf = invarea; if(type == LIGHT_SPOT) { - /* spot light attentuation */ + /* spot light attenuation */ float4 data2 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 2); ls->eval_fac *= spot_light_attenuation(data1, data2, ls); diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index ce15cc33aac..1f740e3f483 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -283,19 +283,19 @@ static const char *get_pass_name(int passtype, int channel) if (channel == -1) return "SubsurfaceDir"; if (channel == 0) return "SubsurfaceDir.R"; if (channel == 1) return "SubsurfaceDir.G"; - return "SubsDir.B"; + return "SubsurfaceDir.B"; } if (passtype == SCE_PASS_SUBSURFACE_INDIRECT) { if (channel == -1) return "SubsurfaceInd"; if (channel == 0) return "SubsurfaceInd.R"; if (channel == 1) return "SubsurfaceInd.G"; - return "SubsInd.B"; + return "SubsurfaceInd.B"; } if (passtype == SCE_PASS_SUBSURFACE_COLOR) { if (channel == -1) return "SubsurfaceCol"; if (channel == 0) return "SubsurfaceCol.R"; if (channel == 1) return "SubsurfaceCol.G"; - return "SubsCol.B"; + return "SubsurfaceCol.B"; } return "Unknown"; } |