[Bf-blender-cvs] [48997d2] master: Cycles: Cleanup, style

Sergey Sharybin noreply at git.blender.org
Mon Oct 24 12:26:30 CEST 2016


Commit: 48997d2e40a74a83fb9edfb9de0999139392f634
Author: Sergey Sharybin
Date:   Mon Oct 24 12:26:12 2016 +0200
Branches: master
https://developer.blender.org/rB48997d2e40a74a83fb9edfb9de0999139392f634

Cycles: Cleanup, style

===================================================================

M	intern/cycles/blender/blender_mesh.cpp
M	intern/cycles/bvh/bvh.cpp
M	intern/cycles/bvh/bvh_node.h
M	intern/cycles/device/opencl/opencl_base.cpp
M	intern/cycles/kernel/kernel_camera.h
M	intern/cycles/kernel/kernel_image_opencl.h
M	intern/cycles/kernel/svm/svm_ramp_util.h
M	intern/cycles/render/camera.cpp
M	intern/cycles/render/graph.cpp
M	intern/cycles/render/image.cpp
M	intern/cycles/render/mesh.cpp
M	intern/cycles/render/nodes.cpp
M	intern/cycles/render/object.cpp
M	intern/cycles/render/osl.cpp
M	intern/cycles/subd/subd_patch_table.cpp
M	intern/cycles/test/render_graph_finalize_test.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index ff1d49f..fab03c7 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -847,7 +847,7 @@ static void sync_mesh_fluid_motion(BL::Object& b_ob, Scene *scene, Mesh *mesh)
 
 	/* Only export previous and next frame, we don't have any in between data. */
 	float motion_times[2] = {-1.0f, 1.0f};
-	for (int step = 0; step < 2; step++) {
+	for(int step = 0; step < 2; step++) {
 		float relative_time = motion_times[step] * scene->motion_shutter_time() * 0.5f;
 		float3 *mP = attr_mP->data_float3() + step*mesh->verts.size();
 
@@ -1081,7 +1081,7 @@ void BlenderSync::sync_mesh_motion(BL::Object& b_ob,
 
 	/* fluid motion is exported immediate with mesh, skip here */
 	BL::DomainFluidSettings b_fluid_domain = object_fluid_domain_find(b_ob);
-	if (b_fluid_domain)
+	if(b_fluid_domain)
 		return;
 
 	if(ccl::BKE_object_is_deform_modified(b_ob, b_scene, preview)) {
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index 9f2468e..4851de5 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -147,7 +147,7 @@ void BVH::pack_primitives()
 	/* Count number of triangles primitives in BVH. */
 	for(unsigned int i = 0; i < tidx_size; i++) {
 		if((pack.prim_index[i] != -1)) {
-			if ((pack.prim_type[i] & PRIMITIVE_ALL_TRIANGLE) != 0) {
+			if((pack.prim_type[i] & PRIMITIVE_ALL_TRIANGLE) != 0) {
 				++num_prim_triangles;
 			}
 		}
@@ -450,7 +450,7 @@ void RegularBVH::pack_inner(const BVHStackEntry& e,
                             const BVHStackEntry& e0,
                             const BVHStackEntry& e1)
 {
-	if (e0.node->is_unaligned() || e1.node->is_unaligned()) {
+	if(e0.node->is_unaligned() || e1.node->is_unaligned()) {
 		pack_unaligned_inner(e, e0, e1);
 	} else {
 		pack_aligned_inner(e, e0, e1);
@@ -597,8 +597,8 @@ void RegularBVH::pack_nodes(const BVHNode *root)
 		else {
 			/* innner node */
 			int idx[2];
-			for (int i = 0; i < 2; ++i) {
-				if (e.node->get_child(i)->is_leaf()) {
+			for(int i = 0; i < 2; ++i) {
+				if(e.node->get_child(i)->is_leaf()) {
 					idx[i] = nextLeafNodeIdx++;
 				}
 				else {
diff --git a/intern/cycles/bvh/bvh_node.h b/intern/cycles/bvh/bvh_node.h
index f2965a7..2faa40a 100644
--- a/intern/cycles/bvh/bvh_node.h
+++ b/intern/cycles/bvh/bvh_node.h
@@ -66,7 +66,7 @@ public:
 	inline void set_aligned_space(const Transform& aligned_space)
 	{
 		m_is_unaligned = true;
-		if (m_aligned_space == NULL) {
+		if(m_aligned_space == NULL) {
 			m_aligned_space = new Transform(aligned_space);
 		}
 		else {
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp
index e67ffb1..a2b9003 100644
--- a/intern/cycles/device/opencl/opencl_base.cpp
+++ b/intern/cycles/device/opencl/opencl_base.cpp
@@ -409,7 +409,7 @@ void OpenCLDeviceBase::enqueue_kernel(cl_kernel kernel, size_t w, size_t h)
 	 * much work per pixel (if we don't check global ID on Y axis) or will
 	 * be checking for global ID to always have Y of 0.
 	 */
-	if (h == 1) {
+	if(h == 1) {
 		global_size[h] = 1;
 	}
 
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index 0888466..b99a82b 100644
--- a/intern/cycles/kernel/kernel_camera.h
+++ b/intern/cycles/kernel/kernel_camera.h
@@ -109,7 +109,7 @@ ccl_device void camera_sample_perspective(KernelGlobals *kg, float raster_x, flo
 	D = normalize(transform_direction(&cameratoworld, D));
 
 	bool use_stereo = kernel_data.cam.interocular_offset != 0.0f;
-	if (!use_stereo) {
+	if(!use_stereo) {
 		/* No stereo */
 		ray->P = P;
 		ray->D = D;
@@ -300,7 +300,7 @@ ccl_device_inline void camera_sample_panorama(KernelGlobals *kg,
 
 	/* Stereo transform */
 	bool use_stereo = kernel_data.cam.interocular_offset != 0.0f;
-	if (use_stereo) {
+	if(use_stereo) {
 		spherical_stereo_transform(kg, &P, &D);
 	}
 
@@ -316,7 +316,7 @@ ccl_device_inline void camera_sample_panorama(KernelGlobals *kg,
 	float3 Dcenter = panorama_to_direction(kg, Pcenter.x, Pcenter.y);
 	Pcenter = transform_point(&cameratoworld, Pcenter);
 	Dcenter = normalize(transform_direction(&cameratoworld, Dcenter));
-	if (use_stereo) {
+	if(use_stereo) {
 		spherical_stereo_transform(kg, &Pcenter, &Dcenter);
 	}
 
@@ -324,7 +324,7 @@ ccl_device_inline void camera_sample_panorama(KernelGlobals *kg,
 	float3 Dx = panorama_to_direction(kg, Px.x, Px.y);
 	Px = transform_point(&cameratoworld, Px);
 	Dx = normalize(transform_direction(&cameratoworld, Dx));
-	if (use_stereo) {
+	if(use_stereo) {
 		spherical_stereo_transform(kg, &Px, &Dx);
 	}
 
@@ -335,7 +335,7 @@ ccl_device_inline void camera_sample_panorama(KernelGlobals *kg,
 	float3 Dy = panorama_to_direction(kg, Py.x, Py.y);
 	Py = transform_point(&cameratoworld, Py);
 	Dy = normalize(transform_direction(&cameratoworld, Dy));
-	if (use_stereo) {
+	if(use_stereo) {
 		spherical_stereo_transform(kg, &Py, &Dy);
 	}
 
diff --git a/intern/cycles/kernel/kernel_image_opencl.h b/intern/cycles/kernel/kernel_image_opencl.h
index f6c31b2..0352c58 100644
--- a/intern/cycles/kernel/kernel_image_opencl.h
+++ b/intern/cycles/kernel/kernel_image_opencl.h
@@ -162,16 +162,18 @@ ccl_device float4 kernel_tex_image_interp_3d(KernelGlobals *kg, int id, float x,
 		svm_image_texture_frac(y*height, &iy);
 		svm_image_texture_frac(z*depth, &iz);
 
-		if (extension == EXTENSION_REPEAT) {
+		if(extension == EXTENSION_REPEAT) {
 			ix = svm_image_texture_wrap_periodic(ix, width);
 			iy = svm_image_texture_wrap_periodic(iy, height);
 			iz = svm_image_texture_wrap_periodic(iz, depth);
 		}
 		else {
-			if (extension == EXTENSION_CLIP) {
+			if(extension == EXTENSION_CLIP) {
 				if(x < 0.0f || y < 0.0f || z < 0.0f ||
 				   x > 1.0f || y > 1.0f || z > 1.0f)
+				 {
 					return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
+				}
 			}
 			/* Fall through. */
 			/* EXTENSION_EXTEND */
@@ -196,10 +198,12 @@ ccl_device float4 kernel_tex_image_interp_3d(KernelGlobals *kg, int id, float x,
 			niz = svm_image_texture_wrap_periodic(iz+1, depth);
 		}
 		else {
-			if (extension == EXTENSION_CLIP)
+			if(extension == EXTENSION_CLIP)
 				if(x < 0.0f || y < 0.0f || z < 0.0f ||
 				   x > 1.0f || y > 1.0f || z > 1.0f)
+				{
 					return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
+				}
 			/* Fall through. */
 			/*  EXTENSION_EXTEND */
 			nix = svm_image_texture_wrap_clamp(ix+1, width);
diff --git a/intern/cycles/kernel/svm/svm_ramp_util.h b/intern/cycles/kernel/svm/svm_ramp_util.h
index 9f2ce12..b0adada 100644
--- a/intern/cycles/kernel/svm/svm_ramp_util.h
+++ b/intern/cycles/kernel/svm/svm_ramp_util.h
@@ -27,9 +27,9 @@ ccl_device_inline float3 rgb_ramp_lookup(const float3 *ramp,
                                          bool extrapolate,
                                          int table_size)
 {
-	if ((f < 0.0f || f > 1.0f) && extrapolate) {
+	if((f < 0.0f || f > 1.0f) && extrapolate) {
 		float3 t0, dy;
-		if (f < 0.0f) {
+		if(f < 0.0f) {
 			t0 = ramp[0];
 			dy = t0 - ramp[1],
 			f = -f;
@@ -50,8 +50,9 @@ ccl_device_inline float3 rgb_ramp_lookup(const float3 *ramp,
 
 	float3 result = ramp[i];
 
-	if (interpolate && t > 0.0f)
+	if(interpolate && t > 0.0f) {
 		result = (1.0f - t) * result + t * ramp[i + 1];
+	}
 
 	return result;
 }
@@ -62,9 +63,9 @@ ccl_device float float_ramp_lookup(const float *ramp,
                                    bool extrapolate,
                                    int table_size)
 {
-	if ((f < 0.0f || f > 1.0f) && extrapolate) {
+	if((f < 0.0f || f > 1.0f) && extrapolate) {
 		float t0, dy;
-		if (f < 0.0f) {
+		if(f < 0.0f) {
 			t0 = ramp[0];
 			dy = t0 - ramp[1],
 			f = -f;
@@ -85,8 +86,9 @@ ccl_device float float_ramp_lookup(const float *ramp,
 
 	float result = ramp[i];
 
-	if (interpolate && t > 0.0f)
+	if(interpolate && t > 0.0f) {
 		result = (1.0f - t) * result + t * ramp[i + 1];
+	}
 
 	return result;
 }
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index a6df656..c8c51ec 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -32,8 +32,9 @@ CCL_NAMESPACE_BEGIN
 static float shutter_curve_eval(float x,
                                 array<float>& shutter_curve)
 {
-	if (shutter_curve.size() == 0)
+	if(shutter_curve.size() == 0) {
 		return 1.0f;
+	}
 
 	x *= shutter_curve.size();
 	int index = (int)x;
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 131ec82..f6c83fb 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -148,8 +148,9 @@ void ShaderNode::attributes(Shader *shader, AttributeRequestSet *attributes)
 
 bool ShaderNode::equals(const ShaderNode& other)
 {
-	if (type != other.type || bump != other.bump)
+	if(type != other.type || bump != other.bump) {
 		return false;
+	}
 
 	assert(inputs.size() == other.inputs.size());
 
@@ -597,13 +598,13 @@ void ShaderGraph::deduplicate_nodes()
 		/* Try to merge this node with another one. */
 		ShaderNode *merge_with = NULL;
 		foreach(ShaderNode *other_node, candidates[node->type->name]) {
-			if (node != other_node && node->equals(*other_node)) {
+			if(node != other_node && node->equals(*other_node)) {
 				merge_with = other_node;
 				break;
 			}
 		}
 		/* If found an equivalent, merge; otherwise keep node for later merges */
-		if (merge_with != NULL) {
+		if(merge_with != NULL) {
 			for(int i = 0; i < node->outputs.size(); ++i) {
 				relink(node, node->outputs[i], merge_with->outputs[i]);
 			}
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 3cb0aa9..073a0aa 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -43,7 +43,7 @@ ImageManager::ImageManager(const DeviceInfo& info)
 	 * be screwed on so many levels..
 	 */
 	DeviceType device_type = info.type;
-	if (device_type == DEVICE_MULTI) {
+	if(device_type == DEVICE_MULTI) {
 		device_type = info.multi_devices[0].type;
 	}
 
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 039bb49..ac369a0 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -1462,7 +1462,7 @@ void MeshManager::device_update_mesh(De

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list