[Bf-blender-cvs] [40c8a182291] master: Cleanup: style

Campbell Barton noreply at git.blender.org
Sat Nov 18 07:17:14 CET 2017


Commit: 40c8a182291ec252bcfd97850f88f7272608fed3
Author: Campbell Barton
Date:   Sat Nov 18 17:22:54 2017 +1100
Branches: master
https://developer.blender.org/rB40c8a182291ec252bcfd97850f88f7272608fed3

Cleanup: style

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

M	source/blender/blenkernel/intern/collision.c
M	source/blender/blenlib/intern/system.c
M	source/blender/blentranslation/msgfmt/msgfmt.c
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/editors/armature/armature_select.c
M	source/blender/editors/space_image/image_buttons.c
M	source/blender/imbuf/intern/indexer.c
M	source/blender/imbuf/intern/openexr/openexr_api.cpp
M	source/blender/makesrna/intern/rna_image.c
M	source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c

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

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index ee25be36855..e22c62c274b 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1147,9 +1147,10 @@ static CollPair *cloth_point_collision(
 	return collpair;
 }
 
-static void cloth_points_objcollisions_nearcheck(ClothModifierData * clmd, CollisionModifierData *collmd,
-                                                     CollPair **collisions, CollPair **collisions_index,
-                                                     int numresult, BVHTreeOverlap *overlap, float epsilon, double dt)
+static void cloth_points_objcollisions_nearcheck(
+        ClothModifierData *clmd, CollisionModifierData *collmd,
+        CollPair **collisions, CollPair **collisions_index,
+        int numresult, BVHTreeOverlap *overlap, float epsilon, double dt)
 {
 	int i;
 	
@@ -1163,8 +1164,9 @@ static void cloth_points_objcollisions_nearcheck(ClothModifierData * clmd, Colli
 	}
 }
 
-static int cloth_points_objcollisions_resolve(ClothModifierData * clmd, CollisionModifierData *collmd, PartDeflect *pd,
-                                              CollPair *collisions, CollPair *collisions_index, float dt)
+static int cloth_points_objcollisions_resolve(
+        ClothModifierData *clmd, CollisionModifierData *collmd, PartDeflect *pd,
+        CollPair *collisions, CollPair *collisions_index, float dt)
 {
 	Cloth *cloth = clmd->clothObject;
 	int i = 0, mvert_num = clmd->clothObject->mvert_num;
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
index 863622f2546..ecb977c6e61 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -50,8 +50,8 @@ int BLI_cpu_support_sse2(void)
 	    "pushl %%ebx\n\t"
 	    "cpuid\n\t"
 	    "popl %%ebx\n\t"
-		: "=d" (d)
-		: "a" (1));
+	    : "=d" (d)
+	    : "a" (1));
 	return (d & 0x04000000) != 0;
 #elif (defined(_MSC_VER) && defined(_M_IX86))
 	/* also check cpuid for MSVC x86 */
diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c b/source/blender/blentranslation/msgfmt/msgfmt.c
index 3abce7b1d3f..49f850f200c 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.c
+++ b/source/blender/blentranslation/msgfmt/msgfmt.c
@@ -184,7 +184,8 @@ typedef struct Offset {
 } Offset;
 
 /* Return the generated binary output. */
-static char *generate(GHash *messages, size_t *r_output_size) {
+static char *generate(GHash *messages, size_t *r_output_size)
+{
 	const uint32_t num_keys = BLI_ghash_size(messages);
 
 	/* Get list of sorted keys. */
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 35bb24cc6aa..635354a9413 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -825,7 +825,8 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *ob)
 				                                           (MetaBall *)obdata),
 				                             DEG_OPCODE_PLACEHOLDER,
 				                             "Geometry Eval");
-			} else {
+			}
+			else {
 				op_node = add_operation_node(obdata,
 				                             DEG_NODE_TYPE_GEOMETRY,
 				                             NULL,
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index f9819887094..07ff7f15ce4 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -936,7 +936,7 @@ static void select_similar_data_pchan(
 	}
 }
 
-static void is_ancestor(EditBone * bone, EditBone * ancestor)
+static void is_ancestor(EditBone *bone, EditBone *ancestor)
 {
 	if (bone->temp.ebone == ancestor || bone->temp.ebone == NULL)
 		return;
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index d2897c7264b..51ccaf6800a 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -433,7 +433,7 @@ static void ui_imageuser_pass_menu(bContext *UNUSED(C), uiLayout *layout, void *
 
 	uiItemS(layout);
 
-	nr = (rl == NULL)? 1: 0;
+	nr = (rl == NULL) ? 1 : 0;
 
 	ListBase added_passes;
 	BLI_listbase_clear(&added_passes);
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index e1b3abcf2f6..009258079ee 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -843,9 +843,9 @@ static void index_rebuild_ffmpeg_finish(FFmpegIndexBuilderContext *context, int
 }
 
 static void index_rebuild_ffmpeg_proc_decoded_frame(
-	FFmpegIndexBuilderContext *context, 
-	AVPacket * curr_packet,
-	AVFrame *in_frame)
+        FFmpegIndexBuilderContext *context,
+        AVPacket *curr_packet,
+        AVFrame *in_frame)
 {
 	int i;
 	unsigned long long s_pos = context->seek_pos;
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 451869415e7..ca534e3e2a8 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -414,11 +414,13 @@ static bool imb_save_openexr_half(
 		frameBuffer.insert("R", Slice(HALF,  (char *) &to->r, xstride, ystride));
 		frameBuffer.insert("G", Slice(HALF,  (char *) &to->g, xstride, ystride));
 		frameBuffer.insert("B", Slice(HALF,  (char *) &to->b, xstride, ystride));
-		if (is_alpha)
+		if (is_alpha) {
 			frameBuffer.insert("A", Slice(HALF, (char *) &to->a, xstride, ystride));
-		if (is_zbuf)
+		}
+		if (is_zbuf) {
 			frameBuffer.insert("Z", Slice(Imf::FLOAT, (char *)(ibuf->zbuf_float + (height - 1) * width),
-							   sizeof(float), sizeof(float) * -width));
+			                              sizeof(float), sizeof(float) * -width));
+		}
 		if (ibuf->rect_float) {
 			float *from;
 
@@ -509,11 +511,13 @@ static bool imb_save_openexr_float(
 		frameBuffer.insert("R", Slice(Imf::FLOAT,  (char *)rect[0], xstride, ystride));
 		frameBuffer.insert("G", Slice(Imf::FLOAT,  (char *)rect[1], xstride, ystride));
 		frameBuffer.insert("B", Slice(Imf::FLOAT,  (char *)rect[2], xstride, ystride));
-		if (is_alpha)
+		if (is_alpha) {
 			frameBuffer.insert("A", Slice(Imf::FLOAT,  (char *)rect[3], xstride, ystride));
-		if (is_zbuf)
+		}
+		if (is_zbuf) {
 			frameBuffer.insert("Z", Slice(Imf::FLOAT, (char *) (ibuf->zbuf_float + (height - 1) * width),
-											  sizeof(float), sizeof(float) * -width));
+			                              sizeof(float), sizeof(float) * -width));
+		}
 
 		file.setFrameBuffer(frameBuffer);
 		file.writePixels(height);
@@ -1125,7 +1129,7 @@ void IMB_exr_read_channels(void *handle)
 		ExrChannel *echan;
 
 		for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next) {
-			if(echan->m->part_number != i) {
+			if (echan->m->part_number != i) {
 				continue;
 			}
 
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index cb5d731efc5..cb71cf756ec 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -175,7 +175,7 @@ static void rna_ImageUser_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *
 
 	BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
 
-	if(ptr->id.data) {
+	if (ptr->id.data) {
 		/* Update material or texture for render preview. */
 		DAG_id_tag_update(ptr->id.data, 0);
 	}
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c
index 006bd0cc8bb..8748c884a25 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c
@@ -66,7 +66,7 @@ static void node_shader_free_tex_pointdensity(bNode *node)
 	MEM_freeN(point_density);
 }
 
-static void node_shader_copy_tex_pointdensity(bNodeTree * UNUSED(dest_ntree),
+static void node_shader_copy_tex_pointdensity(bNodeTree *UNUSED(dest_ntree),
                                               bNode *dest_node,
                                               bNode *src_node)
 {



More information about the Bf-blender-cvs mailing list