Cycles:
* Forgot to rename some SSS pass strings. * Some typo fixes.
This commit is contained in:
parent
26f52fb441
commit
02ec0b9431
@ -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;
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user