Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Cleanup, delete trailing whitespace

Browse Source
This commit is contained in:
Sergey Sharybin
2017-11-01 11:06:55 +01:00
parent a819ef65c0
commit 7f45acee80
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/kernel/kernel_shader.h
View File

@@ -96,7 +96,7 @@ ccl_device_noinline void shader_setup_from_ray(KernelGlobals *kg,
sd->P = triangle_refine(kg, sd, isect, ray); sd->P = triangle_refine(kg, sd, isect, ray);
sd->Ng = Ng; sd->Ng = Ng;
sd->N = Ng; sd->N = Ng;
/* smooth normal */ /* smooth normal */
if(sd->shader & SHADER_SMOOTH_NORMAL) if(sd->shader & SHADER_SMOOTH_NORMAL)
sd->N = triangle_smooth_normal(kg, Ng, sd->prim, sd->u, sd->v); sd->N = triangle_smooth_normal(kg, Ng, sd->prim, sd->u, sd->v);
@@ -419,7 +419,7 @@ ccl_device_inline void shader_setup_from_volume(KernelGlobals *kg, ShaderData *s
{ {
/* vectors */ /* vectors */
sd->P = ray->P; sd->P = ray->P;
sd->N = -ray->D; sd->N = -ray->D;
sd->Ng = -ray->D; sd->Ng = -ray->D;
sd->I = -ray->D; sd->I = -ray->D;
sd->shader = SHADER_NONE; sd->shader = SHADER_NONE;
@@ -797,7 +797,7 @@ ccl_device float3 shader_bsdf_alpha(KernelGlobals *kg, ShaderData *sd)
alpha = max(alpha, make_float3(0.0f, 0.0f, 0.0f)); alpha = max(alpha, make_float3(0.0f, 0.0f, 0.0f));
alpha = min(alpha, make_float3(1.0f, 1.0f, 1.0f)); alpha = min(alpha, make_float3(1.0f, 1.0f, 1.0f));
return alpha; return alpha;
} }
@@ -919,7 +919,7 @@ ccl_device float3 shader_bssrdf_sum(ShaderData *sd, float3 *N_, float *texture_b
if(texture_blur_) if(texture_blur_)
*texture_blur_ = safe_divide(texture_blur, weight_sum); *texture_blur_ = safe_divide(texture_blur, weight_sum);
return eval; return eval;
} }
#endif #endif
@@ -1075,7 +1075,7 @@ ccl_device int shader_volume_phase_sample(KernelGlobals *kg, const ShaderData *s
for(sampled = 0; sampled < sd->num_closure; sampled++) { for(sampled = 0; sampled < sd->num_closure; sampled++) {
const ShaderClosure *sc = &sd->closure[sampled]; const ShaderClosure *sc = &sd->closure[sampled];
if(CLOSURE_IS_PHASE(sc->type)) if(CLOSURE_IS_PHASE(sc->type))
sum += sc->sample_weight; sum += sc->sample_weight;
} }
@@ -1085,7 +1085,7 @@ ccl_device int shader_volume_phase_sample(KernelGlobals *kg, const ShaderData *s
for(sampled = 0; sampled < sd->num_closure; sampled++) { for(sampled = 0; sampled < sd->num_closure; sampled++) {
const ShaderClosure *sc = &sd->closure[sampled]; const ShaderClosure *sc = &sd->closure[sampled];
if(CLOSURE_IS_PHASE(sc->type)) { if(CLOSURE_IS_PHASE(sc->type)) {
float next_sum = partial_sum + sc->sample_weight; float next_sum = partial_sum + sc->sample_weight;
@@ -1239,4 +1239,3 @@ ccl_device bool shader_transparent_shadow(KernelGlobals *kg, Intersection *isect
#endif #endif
CCL_NAMESPACE_END CCL_NAMESPACE_END