Commit: 557074c30ad98aa4cd05f012a25f0d17002b9ac8
Author: Sergey Sharybin
Date: Wed Feb 3 12:17:39 2016 +0100
Branches: master
https://developer.blender.org/rB557074c30ad98aa4cd05f012a25f0d17002b9ac8
Cycles: Cleanup, indentation
Not sure why it was mixed tabs and spaces, it's all just
confusing in different editors.
===================================================================
M intern/cycles/kernel/osl/background.cpp
M intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
M intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
M intern/cycles/kernel/osl/emissive.cpp
M intern/cycles/kernel/osl/osl_bssrdf.cpp
M intern/cycles/kernel/osl/osl_closures.h
===================================================================
diff --git a/intern/cycles/kernel/osl/background.cpp
b/intern/cycles/kernel/osl/background.cpp
index 4d70bc8..85fa7b3 100644
--- a/intern/cycles/kernel/osl/background.cpp
+++ b/intern/cycles/kernel/osl/background.cpp
@@ -77,8 +77,8 @@ public:
ClosureParam *closure_background_params()
{
static ClosureParam params[] = {
- CLOSURE_STRING_KEYPARAM(GenericBackgroundClosure, label, "label"),
- CLOSURE_FINISH_PARAM(GenericBackgroundClosure)
+ CLOSURE_STRING_KEYPARAM(GenericBackgroundClosure, label,
"label"),
+ CLOSURE_FINISH_PARAM(GenericBackgroundClosure)
};
return params;
}
@@ -88,7 +88,7 @@ CCLOSURE_PREPARE(closure_background_prepare,
GenericBackgroundClosure)
ClosureParam *closure_holdout_params()
{
static ClosureParam params[] = {
- CLOSURE_FINISH_PARAM(HoldoutClosure)
+ CLOSURE_FINISH_PARAM(HoldoutClosure)
};
return params;
}
@@ -98,8 +98,8 @@ CCLOSURE_PREPARE(closure_holdout_prepare, HoldoutClosure)
ClosureParam *closure_ambient_occlusion_params()
{
static ClosureParam params[] = {
- CLOSURE_STRING_KEYPARAM(AmbientOcclusionClosure, label, "label"),
- CLOSURE_FINISH_PARAM(AmbientOcclusionClosure)
+ CLOSURE_STRING_KEYPARAM(AmbientOcclusionClosure, label,
"label"),
+ CLOSURE_FINISH_PARAM(AmbientOcclusionClosure)
};
return params;
}
diff --git a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
index b3c71e4..b5c0d76 100644
--- a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
@@ -94,7 +94,7 @@ ClosureParam *closure_bsdf_diffuse_ramp_params()
CLOSURE_FLOAT3_PARAM(DiffuseRampClosure, sc.N),
CLOSURE_COLOR_ARRAY_PARAM(DiffuseRampClosure, colors, 8),
CLOSURE_STRING_KEYPARAM(DiffuseRampClosure, label, "label"),
- CLOSURE_FINISH_PARAM(DiffuseRampClosure)
+ CLOSURE_FINISH_PARAM(DiffuseRampClosure)
};
return params;
}
diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
index 99f510d..bc73d80 100644
--- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
@@ -94,7 +94,7 @@ ClosureParam *closure_bsdf_phong_ramp_params()
CLOSURE_FLOAT_PARAM(PhongRampClosure, sc.data0),
CLOSURE_COLOR_ARRAY_PARAM(PhongRampClosure, colors, 8),
CLOSURE_STRING_KEYPARAM(PhongRampClosure, label, "label"),
- CLOSURE_FINISH_PARAM(PhongRampClosure)
+ CLOSURE_FINISH_PARAM(PhongRampClosure)
};
return params;
}
diff --git a/intern/cycles/kernel/osl/emissive.cpp
b/intern/cycles/kernel/osl/emissive.cpp
index 9a95fa5..f91fd6e 100644
--- a/intern/cycles/kernel/osl/emissive.cpp
+++ b/intern/cycles/kernel/osl/emissive.cpp
@@ -77,8 +77,8 @@ public:
ClosureParam *closure_emission_params()
{
static ClosureParam params[] = {
- CLOSURE_STRING_KEYPARAM(GenericEmissiveClosure, label, "label"),
- CLOSURE_FINISH_PARAM(GenericEmissiveClosure)
+ CLOSURE_STRING_KEYPARAM(GenericEmissiveClosure, label, "label"),
+ CLOSURE_FINISH_PARAM(GenericEmissiveClosure)
};
return params;
}
diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp
b/intern/cycles/kernel/osl/osl_bssrdf.cpp
index bc39592..7f286c7 100644
--- a/intern/cycles/kernel/osl/osl_bssrdf.cpp
+++ b/intern/cycles/kernel/osl/osl_bssrdf.cpp
@@ -69,8 +69,8 @@ ClosureParam *closure_bssrdf_cubic_params()
CLOSURE_FLOAT3_PARAM(CubicBSSRDFClosure, radius),
CLOSURE_FLOAT_PARAM(CubicBSSRDFClosure, sc.data1),
CLOSURE_FLOAT_PARAM(CubicBSSRDFClosure, sc.T.x),
- CLOSURE_STRING_KEYPARAM(CubicBSSRDFClosure, label, "label"),
- CLOSURE_FINISH_PARAM(CubicBSSRDFClosure)
+ CLOSURE_STRING_KEYPARAM(CubicBSSRDFClosure, label, "label"),
+ CLOSURE_FINISH_PARAM(CubicBSSRDFClosure)
};
return params;
}
@@ -97,8 +97,8 @@ ClosureParam *closure_bssrdf_gaussian_params()
CLOSURE_FLOAT3_PARAM(GaussianBSSRDFClosure, sc.N),
CLOSURE_FLOAT3_PARAM(GaussianBSSRDFClosure, radius),
CLOSURE_FLOAT_PARAM(GaussianBSSRDFClosure, sc.data1),
- CLOSURE_STRING_KEYPARAM(GaussianBSSRDFClosure, label, "label"),
- CLOSURE_FINISH_PARAM(GaussianBSSRDFClosure)
+ CLOSURE_STRING_KEYPARAM(GaussianBSSRDFClosure, label, "label"),
+ CLOSURE_FINISH_PARAM(GaussianBSSRDFClosure)
};
return params;
}
diff --git a/intern/cycles/kernel/osl/osl_closures.h
b/intern/cycles/kernel/osl/osl_closures.h
index c0bf25a..d8a3f77 100644
--- a/intern/cycles/kernel/osl/osl_closures.h
+++ b/intern/cycles/kernel/osl/osl_closures.h
@@ -185,7 +185,7 @@ static ClosureParam *bsdf_##lower##_params() \
#define BSDF_CLOSURE_CLASS_END(Upper, lower) \
CLOSURE_STRING_KEYPARAM(Upper##Closure, label, "label"), \
- CLOSURE_FINISH_PARAM(Upper##Closure) \
+ CLOSURE_FINISH_PARAM(Upper##Closure) \
}; \
return params; \
} \
@@ -233,7 +233,7 @@ static ClosureParam *volume_##lower##_params() \
#define VOLUME_CLOSURE_CLASS_END(Upper, lower) \
CLOSURE_STRING_KEYPARAM(Upper##Closure, label, "label"), \
- CLOSURE_FINISH_PARAM(Upper##Closure) \
+ CLOSURE_FINISH_PARAM(Upper##Closure) \
}; \
return params; \
} \
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
