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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-15 03:11:47 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-15 03:11:47 +0400
commita425790065fedb2ae49f1b79770945d8528790d9 (patch)
tree052e85489c48215485ca30ea238fb3ef230a63ed /intern/cycles/kernel/osl/osl_services.cpp
parenta77d048f66dbc837cabe3dcefe070126647f3c8c (diff)
style cleanup
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.cpp')
-rw-r--r--intern/cycles/kernel/osl/osl_services.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 9d5055112ff..f1deaa9db9d 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -182,7 +182,8 @@ bool OSLRenderServices::get_array_attribute(void *renderstate, bool derivatives,
static void set_attribute_float3(float3 f[3], TypeDesc type, bool derivatives, void *val)
{
if (type == TypeDesc::TypePoint || type == TypeDesc::TypeVector ||
- type == TypeDesc::TypeNormal || type == TypeDesc::TypeColor) {
+ type == TypeDesc::TypeNormal || type == TypeDesc::TypeColor)
+ {
float3 *fval = (float3 *)val;
fval[0] = f[0];
if (derivatives) {
@@ -203,7 +204,8 @@ static void set_attribute_float3(float3 f[3], TypeDesc type, bool derivatives, v
static void set_attribute_float(float f[3], TypeDesc type, bool derivatives, void *val)
{
if (type == TypeDesc::TypePoint || type == TypeDesc::TypeVector ||
- type == TypeDesc::TypeNormal || type == TypeDesc::TypeColor) {
+ type == TypeDesc::TypeNormal || type == TypeDesc::TypeColor)
+ {
float3 *fval = (float3 *)val;
fval[0] = make_float3(f[0], f[0], f[0]);
if (derivatives) {
@@ -232,7 +234,8 @@ static bool get_mesh_attribute(KernelGlobals *kg, const ShaderData *sd, const OS
return true;
}
else if (attr.type == TypeDesc::TypePoint || attr.type == TypeDesc::TypeVector ||
- attr.type == TypeDesc::TypeNormal || attr.type == TypeDesc::TypeColor) {
+ attr.type == TypeDesc::TypeNormal || attr.type == TypeDesc::TypeColor)
+ {
/* todo: this won't work when float3 has w component */
float3 fval[3];
fval[0] = triangle_attribute_float3(kg, sd, attr.elem, attr.offset,
@@ -419,15 +422,16 @@ bool OSLRenderServices::has_userdata(ustring name, TypeDesc type, void *renderst
}
int OSLRenderServices::pointcloud_search(OSL::ShaderGlobals *sg, ustring filename, const OSL::Vec3 &center,
- 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)
{
- return 0;
+ return 0;
}
int OSLRenderServices::pointcloud_get(ustring filename, size_t *indices, int count,
- ustring attr_name, TypeDesc attr_type, void *out_data)
+ ustring attr_name, TypeDesc attr_type, void *out_data)
{
- return 0;
+ return 0;
}
CCL_NAMESPACE_END