[Bf-blender-cvs] [b633d760a20] master: Cleanup: style

Campbell Barton noreply at git.blender.org
Wed Jun 27 22:43:31 CEST 2018


Commit: b633d760a20044faba430afe4dd094ad013fcb13
Author: Campbell Barton
Date:   Wed Jun 27 22:32:52 2018 +0200
Branches: master
https://developer.blender.org/rBb633d760a20044faba430afe4dd094ad013fcb13

Cleanup: style

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

M	source/blender/blenkernel/intern/bvhutils.c
M	source/blender/blenkernel/intern/library.c
M	source/blender/editors/mesh/editmesh_bisect.c
M	source/blender/editors/mesh/editmesh_extrude_screw.c
M	source/blender/makesrna/intern/rna_particle.c
M	source/blender/modifiers/intern/MOD_particleinstance.c

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

diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index c678f71dff9..e48c6ff38d2 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -1152,7 +1152,7 @@ BVHTree *bvhtree_from_mesh_get(
 			MEM_freeN(mloop);
 		}
 		if (looptri_allocated) {
-			MEM_freeN((void*)looptri);
+			MEM_freeN((void *)looptri);
 		}
 
 		memset(data, 0, sizeof(*data));
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 00c542bcd4a..0eb943cc15b 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -2417,8 +2417,8 @@ void BKE_id_tag_clear_atomic(ID *id, int tag)
 
 /** Check that given ID pointer actually is in G_MAIN.
  * Main intended use is for debug asserts in places we cannot easily get rid of G_Main... */
-bool BKE_id_is_in_gobal_main(ID *id) {
+bool BKE_id_is_in_gobal_main(ID *id)
+{
 	/* We do not want to fail when id is NULL here, even though this is a bit strange behavior... */
 	return (id == NULL || BLI_findindex(which_libbase(G_MAIN, GS(id->name)), id) != -1);
 }
-
diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c
index d1531972eb2..783fe931670 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -348,7 +348,7 @@ void MESH_OT_bisect(struct wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "clear_outer", false, "Clear Outer", "Remove geometry in front of the plane");
 
 	RNA_def_float(ot->srna, "threshold", 0.0001, 0.0, 10.0, "Axis Threshold",
-													"Preserves the existing geometry along the cut plane", 0.00001, 0.1);
+	              "Preserves the existing geometry along the cut plane", 0.00001, 0.1);
 
 	WM_operator_properties_gesture_straightline(ot, CURSOR_EDIT);
 }
diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.c b/source/blender/editors/mesh/editmesh_extrude_screw.c
index ffbbae60949..de9f714dfe8 100644
--- a/source/blender/editors/mesh/editmesh_extrude_screw.c
+++ b/source/blender/editors/mesh/editmesh_extrude_screw.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/mesh/editmesh_extrude_spin.c
+/** \file blender/editors/mesh/editmesh_extrude_screw.c
  *  \ingroup edmesh
  */
 
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 5d35342d7ed..fc8f28f4f2c 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -696,7 +696,7 @@ static void rna_Particle_change_physics_type(Main *bmain, Scene *scene, PointerR
 		BLI_addtail(&state->rules, boid_new_rule(eBoidRuleType_Separate));
 		BLI_addtail(&state->rules, boid_new_rule(eBoidRuleType_Flock));
 
-		((BoidRule*)state->rules.first)->flag |= BOIDRULE_CURRENT;
+		((BoidRule *)state->rules.first)->flag |= BOIDRULE_CURRENT;
 
 		state->flag |= BOIDSTATE_CURRENT;
 		BLI_addtail(&part->boids->states, state);
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index 9b5b07e4b74..267ef362d03 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -223,7 +223,7 @@ static DerivedMesh *applyModifier(
 	MPoly *mpoly, *orig_mpoly;
 	MLoop *mloop, *orig_mloop;
 	MVert *mvert, *orig_mvert;
-	int totvert, totpoly, totloop , totedge;
+	int totvert, totpoly, totloop, totedge;
 	int maxvert, maxpoly, maxloop, maxedge, part_end = 0, part_start;
 	int k, p, p_skip;
 	short track = ob->trackflag % 3, trackneg, axis = pimd->axis;



More information about the Bf-blender-cvs mailing list