[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51403] trunk/blender/intern/cycles/kernel /osl/osl_services.cpp: Fix for OSL compile errors.

[Lukas Toenne]

Revision: 51403
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51403
Author:   lukastoenne
Date:     2012-10-18 13:16:57 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
Fix for OSL compile errors.

1) object_fetch_transform_motion omits the per-object motion blur test (r51394), must use object_fetch_transform_motion_test.
2) KernelCamera.ndctoworld has been removed (r51402), do transform invert directly.

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

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

Modified: trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_services.cpp	2012-10-18 12:45:27 UTC (rev 51402)
+++ trunk/blender/intern/cycles/kernel/osl/osl_services.cpp	2012-10-18 13:16:57 UTC (rev 51403)
@@ -73,7 +73,7 @@
 
 		if (object != ~0) {
 #ifdef __OBJECT_MOTION__
-			Transform tfm = object_fetch_transform_motion(kg, object, time);
+			Transform tfm = object_fetch_transform_motion_test(kg, object, time, NULL);
 #else
 			Transform tfm = object_fetch_transform(kg, object, OBJECT_TRANSFORM);
 #endif
@@ -99,7 +99,7 @@
 		if (object != ~0) {
 #ifdef __OBJECT_MOTION__
 			Transform itfm;
-			object_fetch_transform_motion(kg, object, time);
+			object_fetch_transform_motion_test(kg, object, time, &itfm);
 #else
 			Transform itfm = object_fetch_transform(kg, object, OBJECT_INVERSE_TRANSFORM);
 #endif
@@ -118,7 +118,7 @@
 	KernelGlobals *kg = kernel_globals;
 
 	if (from == u_ndc) {
-		Transform tfm = transform_transpose(kernel_data.cam.ndctoworld);
+		Transform tfm = transform_transpose(transform_quick_inverse(kernel_data.cam.worldtondc));
 		result = TO_MATRIX44(tfm);
 		return true;
 	}