diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
| commit | 224edde807d76dcccfdb2b204cfa1739d544eca0 (patch) | |
| tree | 034b5e1afecc9473d2932010b88bc8c642f9fe59 /intern/cycles/kernel/shaders/node_vector_transform.osl | |
| parent | af2d39d902c0e302a32b979a8d47ff8e067c0d65 (diff) | |
| parent | 617c4d6adbfe64b3a72b5c48f918f39d30aa18dc (diff) | |
Merge branch 'master' into custom-normals-bmeshcustom-normals-bmesh
Diffstat (limited to 'intern/cycles/kernel/shaders/node_vector_transform.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_vector_transform.osl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/shaders/node_vector_transform.osl b/intern/cycles/kernel/shaders/node_vector_transform.osl index 8ebaa31ab25..afb95b340d1 100644 --- a/intern/cycles/kernel/shaders/node_vector_transform.osl +++ b/intern/cycles/kernel/shaders/node_vector_transform.osl @@ -17,18 +17,18 @@ #include "stdosl.h" shader node_vector_transform( - string type = "Vector", + string type = "vector", string convert_from = "world", string convert_to = "object", vector VectorIn = vector(0.0, 0.0, 0.0), output vector VectorOut = vector(0.0, 0.0, 0.0)) { - if (type == "Vector" || type == "Normal") { + if (type == "vector" || type == "normal") { VectorOut = transform(convert_from, convert_to, VectorIn); - if (type == "Normal") + if (type == "normal") VectorOut = normalize(VectorOut); } - else if (type == "Point") { + else if (type == "point") { point Point = (point)VectorIn; VectorOut = transform(convert_from, convert_to, Point); } |