diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-06-05 19:40:02 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-06-05 19:40:02 +0400 |
| commit | da38a0348a37de625296ed527bcae666a0c0fcb0 (patch) | |
| tree | 5c2aa16853711d920c3319d7b998ace5a8003d07 /intern | |
| parent | 957ea14511053f404c399385953640e2f0333bc0 (diff) | |
Cycles / OSL:
* Fixes for r46114, object_fetch_transform missed time argument.
* Syntax fixes for Checker texture.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/osl/nodes/node_checker_texture.osl | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/osl/nodes/node_checker_texture.osl b/intern/cycles/kernel/osl/nodes/node_checker_texture.osl index 712d51333ad..a80242ad36a 100644 --- a/intern/cycles/kernel/osl/nodes/node_checker_texture.osl +++ b/intern/cycles/kernel/osl/nodes/node_checker_texture.osl @@ -42,9 +42,9 @@ float checker(point p) shader node_checker_texture( float Scale = 5.0, point Vector = P, - color Color1 = color(0.8, 0.8, 0.8); - color Color2 = color(0.2, 0.2, 0.2); - output float Fac = 0.0) + color Color1 = color(0.8, 0.8, 0.8), + color Color2 = color(0.2, 0.2, 0.2), + output float Fac = 0.0, output color Color = color(0.0, 0.0, 0.0)) { Fac = checker(Vector*Scale); diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index ca9e47c9f77..12f3a377ef4 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -72,7 +72,7 @@ bool OSLRenderServices::get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr int object = sd->object; if (object != ~0) { - Transform tfm = object_fetch_transform(kg, object, OBJECT_TRANSFORM); + Transform tfm = object_fetch_transform(kg, object, time, OBJECT_TRANSFORM); tfm = transform_transpose(tfm); result = TO_MATRIX44(tfm); @@ -93,7 +93,7 @@ bool OSLRenderServices::get_inverse_matrix(OSL::Matrix44 &result, OSL::Transform int object = sd->object; if (object != ~0) { - Transform tfm = object_fetch_transform(kg, object, OBJECT_INVERSE_TRANSFORM); + Transform tfm = object_fetch_transform(kg, object, time, OBJECT_INVERSE_TRANSFORM); tfm = transform_transpose(tfm); result = TO_MATRIX44(tfm); |