diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-15 03:11:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-15 03:11:47 +0400 |
commit | a425790065fedb2ae49f1b79770945d8528790d9 (patch) | |
tree | 052e85489c48215485ca30ea238fb3ef230a63ed /intern/cycles/kernel/osl/osl_services.h | |
parent | a77d048f66dbc837cabe3dcefe070126647f3c8c (diff) |
style cleanup
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.h')
-rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 5ec8a8edf9e..790b02a8abc 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -56,22 +56,22 @@ public: bool get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform); bool get_matrix(OSL::Matrix44 &result, ustring from); - bool get_array_attribute(void *renderstate, bool derivatives, + bool get_array_attribute(void *renderstate, bool derivatives, ustring object, TypeDesc type, ustring name, int index, void *val); bool get_attribute(void *renderstate, bool derivatives, ustring object, TypeDesc type, ustring name, void *val); - bool get_userdata(bool derivatives, ustring name, TypeDesc type, + bool get_userdata(bool derivatives, ustring name, TypeDesc type, void *renderstate, void *val); bool has_userdata(ustring name, TypeDesc type, void *renderstate); - + int pointcloud_search(OSL::ShaderGlobals *sg, ustring filename, const OSL::Vec3 ¢er, - float radius, int max_points, bool sort, size_t *out_indices, - float *out_distances, int derivs_offset); + float radius, int max_points, bool sort, size_t *out_indices, + float *out_distances, int derivs_offset); int pointcloud_get(ustring filename, size_t *indices, int count, ustring attr_name, - TypeDesc attr_type, void *out_data); + TypeDesc attr_type, void *out_data); private: KernelGlobals *kernel_globals; |