style cleanup

intern/bsp/intern/BSP_CSGMesh_CFIterator.h

@@ -130,7 +130,7 @@ BSP_CSGMeshVertexIt_Construct(
 	if ( output->num_elements > 0 )
 		v_it->pos = &mesh->VertexSet()[0];
 	output->it = v_it;
-};			
+}
 
 
 /**

intern/container/intern/CTR_List.cpp

@@ -33,57 +33,45 @@
 #include "CTR_List.h"
 
 
-CTR_Link::
-CTR_Link(
-) : 
+CTR_Link::CTR_Link() :
 	m_next(0), 
 	m_prev(0) 
 {
 }
 
-CTR_Link::
-CTR_Link(
-	CTR_Link *next,
-	CTR_Link *prev
-) : 
+CTR_Link::CTR_Link(CTR_Link *next, CTR_Link *prev) :
 	m_next(next), 
 	m_prev(prev) 
 {
 }
 
 CTR_Link *
-CTR_Link::
-getNext(
-) const {
+CTR_Link::getNext() const
+{
 	return m_next; 
 }
 
 CTR_Link *
-CTR_Link::
-getPrev(
-) const { 
+CTR_Link::getPrev() const
+{
 	return m_prev; 
 }  
 
 bool
-CTR_Link::
-isHead(
-) const { 
+CTR_Link::isHead() const
+{
 	return m_prev == 0; 
 }
 
 bool
-CTR_Link::
-isTail(
-) const { 
+CTR_Link::isTail() const
+{
 	return m_next == 0; 
 }
 
 void
-CTR_Link::
-insertBefore(
-	CTR_Link *link
-) {
+CTR_Link::insertBefore(CTR_Link *link)
+{
 	m_next = link;
 	m_prev = link->m_prev;
 	m_next->m_prev = this;
@@ -91,10 +79,8 @@ insertBefore(
 } 
 
 void
-CTR_Link::
-insertAfter(
-	CTR_Link *link
-) {
+CTR_Link::insertAfter(CTR_Link *link)
+{
 	m_next = link->m_next;
 	m_prev = link;
 	m_next->m_prev = this;
@@ -102,49 +88,40 @@ insertAfter(
 } 
 
 void
-CTR_Link::
-remove(
-) { 
+CTR_Link::remove()
+{
 	m_next->m_prev = m_prev;
 	m_prev->m_next = m_next;
 }
 
 
-CTR_List::
-CTR_List(
-) : 
+CTR_List::CTR_List() :
 	m_head(&m_tail, 0), 
 	m_tail(0, &m_head) 
 {
 }
 
 CTR_Link *
-CTR_List::
-getHead(
-) const { 
+CTR_List:: getHead() const
+{
 	return m_head.getNext(); 
 }
 
 CTR_Link *
-CTR_List::
-getTail(
-) const { 
+CTR_List::getTail() const
+{
 	return m_tail.getPrev();
 } 
 
 void
-CTR_List::
-addHead(
-	CTR_Link *link
-) { 
+CTR_List::addHead(CTR_Link *link)
+{
 	link->insertAfter(&m_head); 
 }
 
 void
-CTR_List::
-addTail(
-	CTR_Link *link
-) { 
+CTR_List::addTail(CTR_Link *link)
+{
 	link->insertBefore(&m_tail); 
 }
 

source/blender/blenkernel/intern/writeffmpeg.c

@@ -1003,9 +1003,11 @@ void BKE_ffmpeg_end(void)
 	
 	fprintf(stderr, "Closing ffmpeg...\n");
 
-/*	if (audio_stream) { SEE UPPER
+#if 0
+	if (audio_stream) { /* SEE UPPER */
 		write_audio_frames();
-    }*/
+	}
+#endif
 
 #ifdef WITH_AUDASPACE
 	if (audio_mixdown_device) {

source/blender/editors/interface/interface_panel.c

@@ -170,10 +170,11 @@ static void panels_collapse_all(ScrArea *sa, ARegion *ar)
 	int flag = ((panel_aligned(sa, ar)==BUT_HORIZONTAL) ? PNL_CLOSEDX : PNL_CLOSEDY);
 
 	for (pa= ar->panels.first; pa; pa= pa->next) {
-        if (pa->type && !(pa->type->flag & PNL_NO_HEADER))
+		if (pa->type && !(pa->type->flag & PNL_NO_HEADER)) {
 			pa->flag = flag;
 		}
 	}
+}
 
 
 static void ui_panel_copy_offset(Panel *pa, Panel *papar)

source/blender/editors/space_clip/clip_editor.c

@@ -691,9 +691,11 @@ void ED_space_clip_set_mask(bContext *C, SpaceClip *sc, Mask *mask)
 {
 	sc->mask = mask;
 
-	if(sc->mask && sc->mask->id.us==0)
+	if (sc->mask && sc->mask->id.us==0) {
 		sc->clip->id.us = 1;
+	}
 
-	if(C)
+	if (C) {
 		WM_event_add_notifier(C, NC_MASK|NA_SELECTED, mask);
 	}
+}

source/blender/modifiers/intern/MOD_explode.c

@@ -205,12 +205,12 @@ static MFace *get_dface(DerivedMesh *dm, DerivedMesh *split, int cur, int i, MFa
 	return df;
 }
 
-#define SET_VERTS(a, b, c, d) \
+#define SET_VERTS(a, b, c, d)  {        \
         v[0] = mf->v##a; uv[0] = a - 1; \
         v[1] = mf->v##b; uv[1] = b - 1; \
         v[2] = mf->v##c; uv[2] = c - 1; \
         v[3] = mf->v##d; uv[3] = d - 1; \
-    (void)0
+    } (void)0
 
 #define GET_ES(v1, v2) edgecut_get(eh, v1, v2)
 #define INT_UV(uvf, c0, c1) interp_v2_v2v2(uvf, mf->uv[c0], mf->uv[c1], 0.5f)

source/blender/modifiers/intern/MOD_solidify.c

@@ -435,7 +435,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 		if (ofs_orig != 0.0f) {
 			scalar_short = scalar_short_vgroup = ofs_orig / 32767.0f;
-			mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? 0 : numVerts); /* as above but swapped, intentional use 'ofs_new' */
+			mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? 0 : numVerts); /* as above but swapped */
 			dv = dvert;
 			for (i = 0; i < numVerts; i++, mv++) {
 				if (dv) {