[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47470] trunk/blender/intern/cycles/kernel /osl: Cycles / OSL:

[Thomas Dinges]

Revision: 47470
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47470
Author:   dingto
Date:     2012-06-05 15:40:02 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Cycles / OSL:
* Fixes for r46114, object_fetch_transform missed time argument.
* Syntax fixes for Checker texture. 

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46114

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
    trunk/blender/intern/cycles/kernel/osl/osl_services.cpp

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl	2012-06-05 15:30:48 UTC (rev 47469)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_checker_texture.osl	2012-06-05 15:40:02 UTC (rev 47470)
@@ -42,9 +42,9 @@
 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);

Modified: trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_services.cpp	2012-06-05 15:30:48 UTC (rev 47469)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.cpp	2012-06-05 15:40:02 UTC (rev 47470)
@@ -72,7 +72,7 @@
 		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 @@
 		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);