Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2015-05-08 13:10:26 +0300
committerThomas Dinges <blender@dingto.org>2015-05-08 13:10:26 +0300
commit900fc43bb4f366764f3a3b04929829ad7abf15ae (patch)
treebdbd12baaa60a5d46a7b20c0f8f40d45944a22d8 /intern/cycles/kernel/kernel_path.h
parent945e302409db0c9677a857ff7d9339c21d1152b7 (diff)
Cleanup: Remove unused ray type flags.
They were added for completeness, but it seems we don't need them.
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
-rw-r--r--intern/cycles/kernel/kernel_path.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index cca7e897a7e..0ba8f694592 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -273,8 +273,6 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, Ray ray,
float bssrdf_u, bssrdf_v;
path_state_rng_2D(kg, rng, &state, PRNG_BSDF_U, &bssrdf_u, &bssrdf_v);
subsurface_scatter_step(kg, &sd, state.flag, sc, &lcg_state, bssrdf_u, bssrdf_v, false);
-
- state.flag |= PATH_RAY_BSSRDF_ANCESTOR;
}
}
#endif
@@ -392,7 +390,6 @@ ccl_device bool kernel_path_subsurface_scatter(KernelGlobals *kg, ShaderData *sd
PathState hit_state = *state;
Ray hit_ray = *ray;
- hit_state.flag |= PATH_RAY_BSSRDF_ANCESTOR;
hit_state.rng_offset += PRNG_BOUNCE_NUM;
kernel_path_surface_connect_light(kg, rng, &bssrdf_sd[hit], tp, state, L);
@@ -779,8 +776,6 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg,
float num_samples_inv = 1.0f/num_samples;
RNG bssrdf_rng = cmj_hash(*rng, i);
- state->flag |= PATH_RAY_BSSRDF_ANCESTOR;
-
/* do subsurface scatter step with copy of shader data, this will
* replace the BSSRDF with a diffuse BSDF closure */
for(int j = 0; j < num_samples; j++) {
@@ -832,8 +827,6 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg,
&hit_state, L);
}
}
-
- state->flag &= ~PATH_RAY_BSSRDF_ANCESTOR;
}
}
#endif