[Bf-blender-cvs] [dc13969] master: Style cleanup: indentation, braces
Campbell Barton
noreply at git.blender.org
Sun May 4 18:20:53 CEST 2014
Commit: dc13969e484ed9fa6834b1aba85ba00f65bf8a11
Author: Campbell Barton
Date: Mon May 5 02:19:08 2014 +1000
https://developer.blender.org/rBdc13969e484ed9fa6834b1aba85ba00f65bf8a11
Style cleanup: indentation, braces
===================================================================
M intern/cycles/app/cycles_standalone.cpp
M intern/cycles/app/cycles_xml.h
M intern/cycles/blender/CCL_api.h
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/blender/blender_python.cpp
M intern/cycles/device/device_cuda.cpp
M intern/cycles/device/device_network.cpp
M intern/cycles/device/device_network.h
M intern/cycles/device/device_opencl.cpp
M intern/cycles/kernel/closure/bsdf_hair.h
M intern/cycles/kernel/closure/bsdf_microfacet.h
M intern/cycles/kernel/closure/bsdf_phong_ramp.h
M intern/cycles/kernel/closure/bsdf_util.h
M intern/cycles/kernel/closure/bsdf_westin.h
M intern/cycles/kernel/geom/geom_bvh_shadow.h
M intern/cycles/kernel/geom/geom_object.h
M intern/cycles/kernel/kernel_avx.cpp
M intern/cycles/kernel/kernel_displace.h
M intern/cycles/kernel/kernel_emission.h
M intern/cycles/kernel/kernel_passes.h
M intern/cycles/kernel/kernel_path.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_shadow.h
M intern/cycles/kernel/kernel_sse2.cpp
M intern/cycles/kernel/kernel_sse3.cpp
M intern/cycles/kernel/kernel_sse41.cpp
M intern/cycles/kernel/osl/osl_services.cpp
M intern/cycles/kernel/osl/osl_services.h
M intern/cycles/kernel/osl/osl_shader.cpp
M intern/cycles/kernel/svm/svm_geometry.h
M intern/cycles/kernel/svm/svm_image.h
M intern/cycles/kernel/svm/svm_sepcomb_hsv.h
M intern/cycles/kernel/svm/svm_vector_transform.h
M intern/cycles/kernel/svm/svm_wireframe.h
M intern/cycles/render/curves.cpp
M intern/cycles/render/mesh.cpp
M intern/cycles/render/nodes.cpp
M intern/cycles/render/svm.cpp
M intern/cycles/util/util_color.h
M intern/cycles/util/util_hash.h
M intern/cycles/util/util_opencl.h
M intern/cycles/util/util_simd.h
M intern/cycles/util/util_system.cpp
M intern/cycles/util/util_transform.h
M intern/cycles/util/util_types.h
===================================================================
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 9871273..7ea1ca2 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -214,7 +214,7 @@ static void motion(int x, int y, int button)
/* Rotate */
else if(button == 2) {
- float4 r1= make_float4((float)x * 0.1f, 0.0f, 1.0f, 0.0f);
+ float4 r1 = make_float4((float)x * 0.1f, 0.0f, 1.0f, 0.0f);
matrix = matrix * transform_rotate(DEG2RADF(r1.x), make_float3(r1.y, r1.z, r1.w));
float4 r2 = make_float4(y * 0.1f, 1.0f, 0.0f, 0.0f);
diff --git a/intern/cycles/app/cycles_xml.h b/intern/cycles/app/cycles_xml.h
index 2d225f3..96bc79c 100644
--- a/intern/cycles/app/cycles_xml.h
+++ b/intern/cycles/app/cycles_xml.h
@@ -14,8 +14,8 @@
* limitations under the License
*/
-#ifndef __CYCLES_XML__
-#define __CYCLES_XML__
+#ifndef __CYCLES_XML_H__
+#define __CYCLES_XML_H__
CCL_NAMESPACE_BEGIN
@@ -29,5 +29,4 @@ void xml_read_file(Scene *scene, const char *filepath);
CCL_NAMESPACE_END
-#endif /* __CYCLES_XML__ */
-
+#endif /* __CYCLES_XML_H__ */
diff --git a/intern/cycles/blender/CCL_api.h b/intern/cycles/blender/CCL_api.h
index 6532315..2772b9a 100644
--- a/intern/cycles/blender/CCL_api.h
+++ b/intern/cycles/blender/CCL_api.h
@@ -14,8 +14,8 @@
* limitations under the License
*/
-#ifndef CCL_API_H
-#define CCL_API_H
+#ifndef __CCL_API_H__
+#define __CCL_API_H__
#ifdef __cplusplus
extern "C" {
@@ -40,5 +40,4 @@ void *CCL_python_module_init(void);
}
#endif
-#endif /* CCL_API_H */
-
+#endif /* __CCL_API_H__ */
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 29aecee..fb343a7 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -322,7 +322,8 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector<
/* create triangles */
if(n == 4) {
if(is_zero(cross(mesh->verts[vi[1]] - mesh->verts[vi[0]], mesh->verts[vi[2]] - mesh->verts[vi[0]])) ||
- is_zero(cross(mesh->verts[vi[2]] - mesh->verts[vi[0]], mesh->verts[vi[3]] - mesh->verts[vi[0]]))) {
+ is_zero(cross(mesh->verts[vi[2]] - mesh->verts[vi[0]], mesh->verts[vi[3]] - mesh->verts[vi[0]])))
+ {
mesh->set_triangle(ti++, vi[0], vi[1], vi[3], shader, smooth);
mesh->set_triangle(ti++, vi[2], vi[3], vi[1], shader, smooth);
}
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 658fcca..872f891 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -317,7 +317,8 @@ static PyObject *osl_update_node_func(PyObject *self, PyObject *args)
}
else if(param->type.vecsemantics == TypeDesc::POINT ||
param->type.vecsemantics == TypeDesc::VECTOR ||
- param->type.vecsemantics == TypeDesc::NORMAL) {
+ param->type.vecsemantics == TypeDesc::NORMAL)
+ {
socket_type = "NodeSocketVector";
data_type = BL::NodeSocket::type_VECTOR;
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 29b348d..c667b88 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -508,7 +508,7 @@ public:
if(interpolation == INTERPOLATION_CLOSEST) {
cuda_assert(cuTexRefSetFilterMode(texref, CU_TR_FILTER_MODE_POINT));
}
- else if (interpolation == INTERPOLATION_LINEAR){
+ else if (interpolation == INTERPOLATION_LINEAR) {
cuda_assert(cuTexRefSetFilterMode(texref, CU_TR_FILTER_MODE_LINEAR));
}
else {/* CUBIC and SMART are unsupported for CUDA */
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp
index 8f00324..af05107 100644
--- a/intern/cycles/device/device_network.cpp
+++ b/intern/cycles/device/device_network.cpp
@@ -326,7 +326,7 @@ class DeviceServer {
public:
thread_mutex rpc_lock;
- void network_error(const string &message){
+ void network_error(const string &message) {
error_func.network_error(message);
}
@@ -366,7 +366,7 @@ protected:
{
/* create a new DataVector and insert it into mem_data */
pair<DataMap::iterator,bool> data_ins = mem_data.insert(
- DataMap::value_type(client_pointer, DataVector()));
+ DataMap::value_type(client_pointer, DataVector()));
/* make sure it was a unique insertion */
assert(data_ins.second);
diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h
index 8596b61..893841d 100644
--- a/intern/cycles/device/device_network.h
+++ b/intern/cycles/device/device_network.h
@@ -209,7 +209,7 @@ public:
boost::system::error_code error;
size_t len = boost::asio::read(socket, boost::asio::buffer(header), error);
- if(error.value()){
+ if(error.value()) {
error_func->network_error(error.message());
}
@@ -276,7 +276,7 @@ public:
boost::system::error_code error;
size_t len = boost::asio::read(socket, boost::asio::buffer(buffer, size), error);
- if(error.value()){
+ if(error.value()) {
error_func->network_error(error.message());
}
@@ -391,7 +391,7 @@ private:
/* add address if it's not already in the list */
bool found = std::find(servers.begin(), servers.end(),
- address) != servers.end();
+ address) != servers.end();
if(!found)
servers.push_back(address);
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 2e759d1..694ec9d 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -461,7 +461,7 @@ public:
vector<cl_platform_id> platforms(num_platforms, NULL);
ciErr = clGetPlatformIDs(num_platforms, &platforms[0], NULL);
- if(opencl_error(ciErr)){
+ if(opencl_error(ciErr)) {
fprintf(stderr, "clGetPlatformIDs failed \n");
return;
}
@@ -489,7 +489,7 @@ public:
/* get devices */
vector<cl_device_id> device_ids(num_devices, NULL);
- if(opencl_error(clGetDeviceIDs(cpPlatform, opencl_device_type(), num_devices, &device_ids[0], NULL))){
+ if(opencl_error(clGetDeviceIDs(cpPlatform, opencl_device_type(), num_devices, &device_ids[0], NULL))) {
fprintf(stderr, "clGetDeviceIDs failed \n");
return;
}
@@ -528,7 +528,7 @@ public:
cxContext = clCreateContext(context_props, 1, &cdDevice,
context_notify_callback, cdDevice, &ciErr);
- if(opencl_error(ciErr)){
+ if(opencl_error(ciErr)) {
opencl_error("OpenCL: clCreateContext failed");
return;
}
diff --git a/intern/cycles/kernel/closure/bsdf_hair.h b/intern/cycles/kernel/closure/bsdf_hair.h
index 26e1198..19cdb77 100644
--- a/intern/cycles/kernel/closure/bsdf_hair.h
+++ b/intern/cycles/kernel/closure/bsdf_hair.h
@@ -84,7 +84,7 @@ ccl_device float3 bsdf_hair_reflection_eval_reflect(const ShaderClosure *sc, con
float theta_i = M_PI_2_F - safe_acosf(omega_in_z);
float cosphi_i = dot(omega_in_y, locy);
- if(M_PI_2_F - fabsf(theta_i) < 0.001f || cosphi_i < 0.0f){
+ if(M_PI_2_F - fabsf(theta_i) < 0.001f || cosphi_i < 0.0f) {
*pdf = 0.0f;
return make_float3(*pdf, *pdf, *pdf);
}
@@ -140,7 +140,7 @@ ccl_device float3 bsdf_hair_transmission_eval_transmit(const ShaderClosure *sc,
float theta_i = M_PI_2_F - safe_acosf(omega_in_z);
float phi_i = safe_acosf(dot(omega_in_y, locy));
- if(M_PI_2_F - fabsf(theta_i) < 0.001f){
+ if(M_PI_2_F - fabsf(theta_i) < 0.001f) {
*pdf = 0.0f;
return make_float3(*pdf, *pdf, *pdf);
}
@@ -251,8 +251,8 @@ ccl_device int bsdf_hair_transmission_sample(const ShaderClosure *sc, float3 Ng,
float phi_pdf = roughness2 / (c_TT * (p * p + roughness2 * roughness2));
*omega_in =(cosf(phi) * costheta_i) * locy -
- (sinf(phi) * costheta_i) * locx +
- ( sintheta_i) * Tg;
+ (sinf(phi) * costheta_i) * locx +
+ ( sintheta_i) * Tg;
//differentials - TODO: find a better approximation for the transmission bounce
#ifdef __RAY_DIFFERENTIALS__
@@ -261,7 +261,7 @@ ccl_device int bsdf_hair_transmission_sample(const ShaderClosure *sc, float3 Ng,
#endif
*pdf = fabsf(phi_pdf * theta_pdf);
- if(M_PI_2_F - fabsf(theta_i) < 0.001f){
+ if(M_PI_2_F - fabsf(theta_i) < 0.001f) {
*pdf = 0.0f;
}
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index dfa8886..1ec35e4 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -154,8 +154,8 @@ ccl_device int bsdf_microfacet_ggx_sample(const ShaderClosure *sc, float3 Ng, fl
float sinThetaM = cosThetaM * safe_sqrtf(tanThetaM2);
float phiM = M_2PI_F * randv;
float3 m = (cosf(phiM) * sinThetaM) * X +
- (sinf(phiM) * sinThetaM) * Y +
- cosThetaM * Z;
+ (sinf(phiM) * sinThetaM) * Y +
+ ( cosThetaM) * Z;
if(!m_refractive) {
float cosMO = dot(m, I);
if(cosMO > 0) {
@@ -383,8 +383,8 @@ ccl_device int bsdf_microfacet_beckmann_sample(const ShaderClosure *sc, float3 N
float sinThetaM = cosThetaM * tanThetaM;
float phiM = M_2PI_F * randv;
float3 m = (cosf(phiM) * sinThetaM) * X +
- (sinf(phiM) * sinThetaM) * Y +
- cosThetaM * Z;
+ (sinf(phiM) * sinThetaM) * Y +
+ ( cosThetaM) * Z;
if(!m_refractive) {
float cosMO = dot(m, I);
diff --git a/intern/cycles/kernel/closure/bsdf_phong_ramp.h b/intern/cycles/kernel/closure/bsdf_phong_ramp.h
index 219c5ae..2b4e1c6 100644
--- a/intern/cycles/kernel/closure/bsdf_phong_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_phong_ramp.h
@@ -109,8 +109,8 @@ ccl_device int bsdf_phong_ramp_sample(const ShaderClosure *sc, const float3 colo
float sinTheta2 = 1 - cosTheta * cosTheta;
float sinTheta = sinTheta2 > 0 ? sqrtf(sinTheta2) : 0;
*omega_in = (cosf(phi) * sinTheta) * T +
- (sinf(phi) * sinTheta) * B +
- ( cosTheta) * R;
+ (sinf(phi) * sinTheta) * B +
+ ( cosTheta) * R;
if (dot(Ng, *omega_in) > 0.0f)
{
// common terms for pdf and eval
diff --git a/intern/cycles/kernel/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list