forked from bartvdbraak/blender
Cycles / OSL:
* Fixes for r46114, object_fetch_transform missed time argument. * Syntax fixes for Checker texture.
This commit is contained in:
parent
957ea14511
commit
da38a0348a
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user