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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-29 05:09:24 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-29 07:01:07 +0400
commit746628e0d021fa616c69e9ff0ef9ad71cba23694 (patch)
tree4ca4b0e2d1aae189bc06df1a0b652ec5280a37aa /intern/cycles/kernel/closure/volume.h
parentaa3933b411fc61d673facc6ea6f8cce6d86a3c6c (diff)
Cycles OSL: refactoring to remove all dependencies on builtin OSL closures.
These were removed in new OSL versions. We only used these as base classes, not using them at all simplifies the code a bit.
Diffstat (limited to 'intern/cycles/kernel/closure/volume.h')
-rw-r--r--intern/cycles/kernel/closure/volume.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/intern/cycles/kernel/closure/volume.h b/intern/cycles/kernel/closure/volume.h
index f30b30c8c76..f4932568c1f 100644
--- a/intern/cycles/kernel/closure/volume.h
+++ b/intern/cycles/kernel/closure/volume.h
@@ -53,11 +53,6 @@ ccl_device float3 volume_transparent_eval_phase(const ShaderClosure *sc, const f
ccl_device float3 volume_eval_phase(KernelGlobals *kg, const ShaderClosure *sc, const float3 omega_in, const float3 omega_out)
{
-#ifdef __OSL__
- if(kg->osl && sc->prim)
- return OSLShader::volume_eval_phase(sc, omega_in, omega_out);
-#endif
-
float3 eval;
switch(sc->type) {