Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-10-18 02:58:18 +0400
committerThomas Dinges <blender@dingto.org>2012-10-18 02:58:18 +0400
commitb2142d6533d740b00ac1578de67f4a8d8dc94121 (patch)
treeb7b10b2a941450b8434589fc03de3f3777d1cc9e /intern
parent6915394a3b91b6ac836537d058d6fb6954d38af1 (diff)
Cycles: OSL compile fixes.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/osl/osl_services.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 103acd61879..624d20bbd01 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -73,7 +73,7 @@ bool OSLRenderServices::get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr
if (object != ~0) {
#ifdef __OBJECT_MOTION__
- Transform tfm = object_fetch_transform_motion(kg, object, time, NULL);
+ Transform tfm = object_fetch_transform_motion(kg, object, time);
#else
Transform tfm = object_fetch_transform(kg, object, OBJECT_TRANSFORM);
#endif
@@ -99,7 +99,7 @@ bool OSLRenderServices::get_inverse_matrix(OSL::Matrix44 &result, OSL::Transform
if (object != ~0) {
#ifdef __OBJECT_MOTION__
Transform itfm;
- object_fetch_transform_motion(kg, object, time, &itfm);
+ object_fetch_transform_motion(kg, object, time);
#else
Transform itfm = object_fetch_transform(kg, object, OBJECT_INVERSE_TRANSFORM);
#endif