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@pandora.be>2013-06-11 00:10:03 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-11 00:10:03 +0400
commitd16a608f6d5cfdb45c0a72aaa7c5cbc0ebe19928 (patch)
treedd1df886d084d678d04373c20a5f7edded0bb8cf /intern/cycles/kernel/shaders
parent6322f017835f86e96b8e082f66595debd9de1da9 (diff)
Fix cycles backwards compatibility for specular_toon shader this actually needs
to be done in cycles itself to keep compatibility for bytecode too. Also fix broken button to compile OSL from the text editors, this got broken after recent change to disable editing of library linked nodes.
Diffstat (limited to 'intern/cycles/kernel/shaders')
-rw-r--r--intern/cycles/kernel/shaders/stdosl.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/kernel/shaders/stdosl.h b/intern/cycles/kernel/shaders/stdosl.h
index 09217e52b55..24c3e187783 100644
--- a/intern/cycles/kernel/shaders/stdosl.h
+++ b/intern/cycles/kernel/shaders/stdosl.h
@@ -467,10 +467,7 @@ closure color bssrdf_cubic(normal N, vector radius) BUILTIN;
// Backwards compatibility
-closure color specular_toon(normal N, float size, float smooth)
-{
- return glossy_toon(N, size, smooth);
-}
+closure color specular_toon(normal N, float size, float smooth) BUILTIN;
// Renderer state
int raytype (string typename) BUILTIN;