[Bf-blender-cvs] [2ae6a93f05e] master: Cleanup: style

Campbell Barton noreply at git.blender.org
Wed Nov 1 01:50:46 CET 2017


Commit: 2ae6a93f05e9efb83c943b2782b5d36b3d57f60c
Author: Campbell Barton
Date:   Wed Nov 1 11:56:56 2017 +1100
Branches: master
https://developer.blender.org/rB2ae6a93f05e9efb83c943b2782b5d36b3d57f60c

Cleanup: style

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

M	source/blender/alembic/intern/abc_mball.cc
M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/bmesh/intern/bmesh_edgeloop.c
M	source/blender/editors/interface/interface_layout.c

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

diff --git a/source/blender/alembic/intern/abc_mball.cc b/source/blender/alembic/intern/abc_mball.cc
index 56bb609ace0..1ef7b757577 100644
--- a/source/blender/alembic/intern/abc_mball.cc
+++ b/source/blender/alembic/intern/abc_mball.cc
@@ -54,7 +54,7 @@ AbcMBallWriter::AbcMBallWriter(
 	m_is_animated = isAnimated();
 
 	m_mesh_ob = BKE_object_copy(bmain, ob);
-	m_mesh_ob->curve_cache = (CurveCache*)MEM_callocN(
+	m_mesh_ob->curve_cache = (CurveCache *)MEM_callocN(
 	                             sizeof(CurveCache),
 	                             "CurveCache for AbcMBallWriter");
 
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 1a93031034b..c9f1f288182 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -896,7 +896,7 @@ bool BKE_fcurve_is_cyclic(FCurve *fcu)
 	if (fcm->flag & (FMODIFIER_FLAG_RANGERESTRICT | FMODIFIER_FLAG_USEINFLUENCE))
 		return false;
 
-	FMod_Cycles *data = (FMod_Cycles*)fcm->data;
+	FMod_Cycles *data = (FMod_Cycles *)fcm->data;
 
 	return data && data->after_cycles == 0 && data->before_cycles == 0 &&
 	    ELEM(data->before_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET) &&
@@ -939,14 +939,14 @@ void calchandles_fcurve(FCurve *fcu)
 		return;
 
 	/* if the first modifier is Cycles, smooth the curve through the cycle */
-	BezTriple *first = &fcu->bezt[0], *last = &fcu->bezt[fcu->totvert-1];
+	BezTriple *first = &fcu->bezt[0], *last = &fcu->bezt[fcu->totvert - 1];
 	BezTriple tmp;
 
 	bool cycle = BKE_fcurve_is_cyclic(fcu) && BEZT_IS_AUTOH(first) && BEZT_IS_AUTOH(last);
 
 	/* get initial pointers */
 	bezt = fcu->bezt;
-	prev = cycle_offset_triple(cycle, &tmp, &fcu->bezt[fcu->totvert-2], last, first);
+	prev = cycle_offset_triple(cycle, &tmp, &fcu->bezt[fcu->totvert - 2], last, first);
 	next = (bezt + 1);
 	
 	/* loop over all beztriples, adjusting handles */
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c
index 9d51b59825d..54fe2801d0c 100644
--- a/source/blender/bmesh/intern/bmesh_edgeloop.c
+++ b/source/blender/bmesh/intern/bmesh_edgeloop.c
@@ -168,8 +168,8 @@ int BM_mesh_edgeloops_find(
 
 			/* add both directions */
 			if (bm_loop_build(el_store, e->v1, e->v2,  1) &&
-				bm_loop_build(el_store, e->v2, e->v1, -1) &&
-				el_store->len > 1)
+			    bm_loop_build(el_store, e->v2, e->v1, -1) &&
+			    el_store->len > 1)
 			{
 				BLI_addtail(r_eloops, el_store);
 				count++;
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index a0840f7fb34..616fc055c03 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -875,7 +875,7 @@ void uiItemFullO(
 	        ot, opname, {
 	            if (r_opptr) {
 	                *r_opptr = PointerRNA_NULL;
-	            };
+	            }
 	            return;
 	        });



More information about the Bf-blender-cvs mailing list