[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45268] trunk/blender/source/blender: style cleanup: minor change and remove redundant casts

[Campbell Barton]

Revision: 45268
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45268
Author:   campbellbarton
Date:     2012-03-29 22:35:12 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
style cleanup: minor change and remove redundant casts

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-03-29 22:26:11 UTC (rev 45267)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-03-29 22:35:12 UTC (rev 45268)
@@ -83,7 +83,7 @@
         SeqRenderData context, ListBase *seqbasep, float cfra, int chanshown);
 
 static ImBuf *seq_render_strip(
-    SeqRenderData context, Sequence *seq, float cfra);
+        SeqRenderData context, Sequence *seq, float cfra);
 
 static void seq_free_animdata(Scene *scene, Sequence *seq);
 
@@ -355,7 +355,7 @@
 	rval ^= a->preview_render_size;
 	rval ^= ((intptr_t) a->bmain) << 6;
 	rval ^= ((intptr_t) a->scene) << 6;
-	rval ^= (int) (a->motion_blur_shutter * 100.0f) << 10;
+	rval ^= (int)(a->motion_blur_shutter * 100.0f) << 10;
 	rval ^= a->motion_blur_samples << 24;
 	
 	return rval;
@@ -929,7 +929,9 @@
 	float *rect_float;
 	int tot;
 
-	if (ibuf == NULL || (ibuf->rect == NULL && ibuf->rect_float == NULL)) return;
+	if (ibuf == NULL || (ibuf->rect == NULL && ibuf->rect_float == NULL)) {
+		return;
+	}
 
 	tot = ibuf->x * ibuf->y;
 
@@ -1029,7 +1031,7 @@
 		                           * MOVIE strips use only
 		                           * the first element, all other strips
 		                           * don't use this... */
-		int nr = (int) give_stripelem_index(seq, cfra);
+		int nr = (int)give_stripelem_index(seq, cfra);
 
 		if (nr == -1 || se == NULL) return NULL;
 	
@@ -1238,7 +1240,7 @@
 		frameno = 1;
 	}
 	else {
-		frameno = (int) give_stripelem_index(seq, cfra) + seq->anim_startofs;
+		frameno = (int)give_stripelem_index(seq, cfra) + seq->anim_startofs;
 		BLI_snprintf(name, PROXY_MAXFILE, "%s/proxy_misc/%d/####", dir, 
 		             render_size);
 	}
@@ -1275,7 +1277,7 @@
 	}
 
 	if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) {
-		int frameno = (int) give_stripelem_index(seq, cfra) + seq->anim_startofs;
+		int frameno = (int)give_stripelem_index(seq, cfra) + seq->anim_startofs;
 		if (seq->strip->proxy->anim == NULL) {
 			if (seq_proxy_get_fname(seq, cfra, render_size, name) == 0) {
 				return NULL;
@@ -1415,8 +1417,8 @@
 
 	render_context = seq_new_render_data(
 	        context->bmain, context->scene,
-	        (scene->r.size * (float) scene->r.xsch) / 100.0f + 0.5f,
-	        (scene->r.size * (float) scene->r.ysch) / 100.0f + 0.5f,
+	        (scene->r.size * (float)scene->r.xsch) / 100.0f + 0.5f,
+	        (scene->r.size * (float)scene->r.ysch) / 100.0f + 0.5f,
 	        100);
 
 	for (cfra = seq->startdisp + seq->startstill; 
@@ -1642,7 +1644,7 @@
  */
 
 int input_have_to_preprocess(
-    SeqRenderData UNUSED(context), Sequence *seq, float UNUSED(cfra))
+        SeqRenderData UNUSED(context), Sequence *seq, float UNUSED(cfra))
 {
 	float mul;
 
@@ -1861,14 +1863,14 @@
  * ********************************************************************** */
 
 static ImBuf *seq_render_strip_stack(
-    SeqRenderData context, ListBase *seqbasep, float cfra, int chanshown);
+        SeqRenderData context, ListBase *seqbasep, float cfra, int chanshown);
 
 static ImBuf *seq_render_strip(
-    SeqRenderData context, Sequence *seq, float cfra);
+        SeqRenderData context, Sequence *seq, float cfra);
 
 
 static ImBuf *seq_render_effect_strip_impl(
-    SeqRenderData context, Sequence *seq, float cfra)
+        SeqRenderData context, Sequence *seq, float cfra)
 {
 	float fac, facf;
 	int early_out;
@@ -1919,7 +1921,7 @@
 			for (i = 0; i < 3; i++) {
 				if (input[i])
 					ibuf[i] = seq_render_strip(
-					    context, input[i], cfra);
+					        context, input[i], cfra);
 			}
 
 			if (ibuf[0] && ibuf[1]) {
@@ -2021,7 +2023,7 @@
 }
 
 static ImBuf *seq_render_scene_strip(
-    SeqRenderData context, Sequence *seq, float nr)
+        SeqRenderData context, Sequence *seq, float nr)
 {
 	ImBuf *ibuf = NULL;
 	float frame;
@@ -2235,7 +2237,7 @@
 				sequence_effect_speed_rebuild_map(context.scene, seq, 0);
 
 				/* weeek! */
-				f_cfra = seq->start + s->frameMap[(int) nr];
+				f_cfra = seq->start + s->frameMap[(int)nr];
 
 				child_ibuf = seq_render_strip(context, seq->seq1, f_cfra);
 
@@ -2391,7 +2393,7 @@
 }
 
 static ImBuf *seq_render_strip_stack(
-    SeqRenderData context, ListBase *seqbasep, float cfra, int chanshown)
+        SeqRenderData context, ListBase *seqbasep, float cfra, int chanshown)
 {
 	Sequence *seq_arr[MAXSEQ + 1];
 	int count;

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2012-03-29 22:26:11 UTC (rev 45267)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2012-03-29 22:35:12 UTC (rev 45268)
@@ -856,9 +856,9 @@
 	if (special_seq_update)
 		ibuf = give_ibuf_seq_direct(context, cfra + frame_ofs, special_seq_update);
 	else if (!U.prefetchframes) // XXX || (G.f & G_PLAYANIM) == 0) {
-		ibuf = (ImBuf *)give_ibuf_seq(context, cfra + frame_ofs, sseq->chanshown);
+		ibuf = give_ibuf_seq(context, cfra + frame_ofs, sseq->chanshown);
 	else
-		ibuf = (ImBuf *)give_ibuf_seq_threaded(context, cfra + frame_ofs, sseq->chanshown);
+		ibuf = give_ibuf_seq_threaded(context, cfra + frame_ofs, sseq->chanshown);
 	
 	if (ibuf == NULL)
 		return;