diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-22 19:15:11 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-22 19:15:11 +0400 |
| commit | 80d22a3f1237f67695819445ed30814a01da3fc2 (patch) | |
| tree | 878bd157c0918be5b9eff386defe5c0adf27e8b2 /intern/cycles/kernel/shaders/stdosl.h | |
| parent | 541f5984660c16985b88afe40c7101d5eec626ba (diff) | |
Cycles OSL: handle new getattribute constant folding with renderstate NULL check,
and fix #33654, distance to line segment function is not implemented but compiled
anyway, now it should give a compile error.
Diffstat (limited to 'intern/cycles/kernel/shaders/stdosl.h')
| -rw-r--r-- | intern/cycles/kernel/shaders/stdosl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/stdosl.h b/intern/cycles/kernel/shaders/stdosl.h index 6accf4556ea..69ca6b32c36 100644 --- a/intern/cycles/kernel/shaders/stdosl.h +++ b/intern/cycles/kernel/shaders/stdosl.h @@ -161,7 +161,6 @@ vector cross (vector a, vector b) BUILTIN; float dot (vector a, vector b) BUILTIN; float length (vector v) BUILTIN; float distance (point a, point b) BUILTIN; -float distance (point a, point b, point q) BUILTIN; normal normalize (normal v) BUILTIN; vector normalize (vector v) BUILTIN; vector faceforward (vector N, vector I, vector Nref) BUILTIN; |