[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51784] trunk/blender/source/blender: style cleanup

[Campbell Barton]

Revision: 51784
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51784
Author:   campbellbarton
Date:     2012-10-31 10:09:06 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/curve.c
    trunk/blender/source/blender/blenkernel/intern/texture.c
    trunk/blender/source/blender/editors/physics/physics_fluid.c
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-10-31 10:05:23 UTC (rev 51783)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-10-31 10:09:06 UTC (rev 51784)
@@ -741,13 +741,16 @@
 				else {
 					if (index_mf_to_mpoly) {
 						orig = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, actualFace);
-						if (orig == ORIGINDEX_NONE) continue;
-						if (drawParamsMapped)
+						if (orig == ORIGINDEX_NONE) {
+							continue;
+						}
+						if (drawParamsMapped) {
 							draw_option = drawParamsMapped(userData, orig);
+						}
 					}
-					else
-					if (drawParamsMapped)
+					else if (drawParamsMapped) {
 						draw_option = drawParamsMapped(userData, actualFace);
+					}
 				}
 
 				/* flush buffer if current triangle isn't drawable or it's last triangle */

Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c	2012-10-31 10:05:23 UTC (rev 51783)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c	2012-10-31 10:09:06 UTC (rev 51784)
@@ -818,10 +818,7 @@
 	opp2 = orderpluspnts - 1;
 
 	/* this is for float inaccuracy */
-	if (t < knots[0])
-		t = knots[0];
-	else
-		if (t > knots[opp2]) t = knots[opp2];
+	t = (t < knots[0]) ? knots[0] : knots[opp2];
 
 	/* this part is order '1' */
 	o2 = order + 1;

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2012-10-31 10:05:23 UTC (rev 51783)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2012-10-31 10:09:06 UTC (rev 51784)
@@ -909,8 +909,7 @@
 		if (tex->use_nodes) {
 			new_id(&bmain->tex, (ID *)tex, "Noddy");
 		}
-		else
-		if (tex->type == TEX_IMAGE) {
+		else if (tex->type == TEX_IMAGE) {
 			ima = tex->ima;
 			if (ima) {
 				BLI_strncpy(di, ima->name, sizeof(di));

Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c	2012-10-31 10:05:23 UTC (rev 51783)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c	2012-10-31 10:09:06 UTC (rev 51784)
@@ -944,8 +944,7 @@
 		if (domainSettings->resolutionxyz>128) {
 			gridlevels = 2;
 		}
-		else
-		if (domainSettings->resolutionxyz>64) {
+		else if (domainSettings->resolutionxyz > 64) {
 			gridlevels = 1;
 		}
 		else {

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2012-10-31 10:05:23 UTC (rev 51783)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2012-10-31 10:09:06 UTC (rev 51784)
@@ -3156,11 +3156,12 @@
 			for (sa = window->screen->areabase.first; sa; sa = sa->next) {
 				ARegion *ar;
 				for (ar = sa->regionbase.first; ar; ar = ar->next) {
-					if (ar == sad->ar)
+					if (ar == sad->ar) {
 						ED_region_tag_redraw(ar);
-					else
-					if (match_region_with_redraws(sa->spacetype, ar->regiontype, sad->redraws))
+					}
+					else if (match_region_with_redraws(sa->spacetype, ar->regiontype, sad->redraws)) {
 						ED_region_tag_redraw(ar);
+					}
 				}
 				
 				if (match_area_with_refresh(sa->spacetype, sad->refresh))

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c	2012-10-31 10:05:23 UTC (rev 51783)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c	2012-10-31 10:09:06 UTC (rev 51784)
@@ -414,8 +414,7 @@
 					BLI_strncpy(ed->act_imagedir, seq->strip->dir, FILE_MAXDIR);
 				}
 			}
-			else
-			if (seq->type == SEQ_TYPE_SOUND_RAM) {
+			else if (seq->type == SEQ_TYPE_SOUND_RAM) {
 				if (seq->strip) {
 					BLI_strncpy(ed->act_sounddir, seq->strip->dir, FILE_MAXDIR);
 				}