Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / OSL:

Browse Source 
* Fixes for r46114, object_fetch_transform missed time argument.
* Syntax fixes for Checker texture.
This commit is contained in:
Thomas Dinges
2012-06-05 15:40:02 +00:00
parent 957ea14511
commit da38a0348a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/osl/nodes/node_checker_texture.osl
View File

@@ -42,9 +42,9 @@ float checker(point p)
shader node_checker_texture( shader node_checker_texture(
float Scale = 5.0, float Scale = 5.0,
point Vector = P, point Vector = P,
color Color1 = color(0.8, 0.8, 0.8); color Color1 = color(0.8, 0.8, 0.8),
color Color2 = color(0.2, 0.2, 0.2); color Color2 = color(0.2, 0.2, 0.2),
output float Fac = 0.0) output float Fac = 0.0,
output color Color = color(0.0, 0.0, 0.0)) output color Color = color(0.0, 0.0, 0.0))
{ {
Fac = checker(Vector*Scale); Fac = checker(Vector*Scale);

4
intern/cycles/kernel/osl/osl_services.cpp
View File

@@ -72,7 +72,7 @@ bool OSLRenderServices::get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr
int object = sd->object; int object = sd->object;
if (object != ~0) { 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); tfm = transform_transpose(tfm);
result = TO_MATRIX44(tfm); result = TO_MATRIX44(tfm);
@@ -93,7 +93,7 @@ bool OSLRenderServices::get_inverse_matrix(OSL::Matrix44 &result, OSL::Transform
int object = sd->object; int object = sd->object;
if (object != ~0) { 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); tfm = transform_transpose(tfm);
result = TO_MATRIX44(tfm); result = TO_MATRIX44(tfm);