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

[Campbell Barton]

Revision: 56786
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56786
Author:   campbellbarton
Date:     2013-05-14 06:58:35 +0000 (Tue, 14 May 2013)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/blenlib/intern/listbase.c
    trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    trunk/blender/source/blender/editors/screen/area.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-05-14 06:10:26 UTC (rev 56785)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-05-14 06:58:35 UTC (rev 56786)
@@ -2448,7 +2448,7 @@
 
 /* Get image buffer for previous marker's keyframe. */
 static ImBuf *tracking_context_get_keyframed_ibuf(MovieClip *clip, MovieClipUser *user, int clip_flag,
-												  MovieTrackingTrack *track, int curfra, bool backwards,
+                                                  MovieTrackingTrack *track, int curfra, bool backwards,
                                                   MovieTrackingMarker **marker_keyed_r)
 {
 	MovieTrackingMarker *marker_keyed;
@@ -2464,7 +2464,7 @@
 
 /* Get image buffer which si used as referece for track. */
 static ImBuf *tracking_context_get_reference_ibuf(MovieClip *clip, MovieClipUser *user, int clip_flag,
-												  MovieTrackingTrack *track, int curfra, bool backwards,
+                                                  MovieTrackingTrack *track, int curfra, bool backwards,
                                                   MovieTrackingMarker **reference_marker)
 {
 	ImBuf *ibuf = NULL;
@@ -2496,7 +2496,7 @@
 
 	/* calculate patch for keyframed position */
 	reference_ibuf = tracking_context_get_reference_ibuf(context->clip, &context->user, context->clip_flag,
-														 track, curfra, context->backwards, &reference_marker);
+	                                                     track, curfra, context->backwards, &reference_marker);
 
 	if (!reference_ibuf)
 		return false;
@@ -2641,8 +2641,8 @@
  * to dst_pixel_x and dst_pixel_y.
  */
 static bool configure_and_run_tracker(ImBuf *destination_ibuf, MovieTrackingTrack *track,
-									  MovieTrackingMarker *reference_marker, MovieTrackingMarker *marker,
-									  float *reference_search_area, int reference_search_area_width,
+                                      MovieTrackingMarker *reference_marker, MovieTrackingMarker *marker,
+                                      float *reference_search_area, int reference_search_area_width,
                                       int reference_search_area_height, float *mask,
                                       double dst_pixel_x[5], double dst_pixel_y[5])
 {
@@ -2686,8 +2686,8 @@
 	                            reference_search_area_width,
 	                            reference_search_area_height,
 	                            patch_new,
-								new_search_area_width,
-								new_search_area_height,
+	                            new_search_area_width,
+	                            new_search_area_height,
 	                            src_pixel_x, src_pixel_y,
 	                            &result,
 	                            dst_pixel_x, dst_pixel_y);

Modified: trunk/blender/source/blender/blenlib/intern/listbase.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/listbase.c	2013-05-14 06:10:26 UTC (rev 56785)
+++ trunk/blender/source/blender/blenlib/intern/listbase.c	2013-05-14 06:58:35 UTC (rev 56786)
@@ -584,7 +584,7 @@
 	struct Link *curr = lb->first;
 	struct Link *prev = NULL;
 	struct Link *next = NULL;
-	while(curr) {
+	while (curr) {
 		next = curr->next;
 		curr->next = prev;
 		curr->prev = next;

Modified: trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.cpp	2013-05-14 06:10:26 UTC (rev 56785)
+++ trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.cpp	2013-05-14 06:58:35 UTC (rev 56786)
@@ -136,7 +136,7 @@
 	this->m_image1Reader->read(color1, x, y, sampler);
 	this->m_image2Reader->read(color2, x, y, sampler);
 
-	float fac = (1.0f - mask[0])*(1.0f - color1[3]) + mask[0]*color2[3];
+	float fac = (1.0f - mask[0]) * (1.0f - color1[3]) + mask[0] * color2[3];
 	float mfac = 1.0f - fac;
 
 	output[0] = color1[0] * mfac + color2[0] * fac;

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2013-05-14 06:10:26 UTC (rev 56785)
+++ trunk/blender/source/blender/editors/screen/area.c	2013-05-14 06:58:35 UTC (rev 56786)
@@ -459,7 +459,7 @@
 	glEnable(GL_BLEND);
 	glColor4f(drand48(), drand48(), drand48(), 0.1f);
 	glRectf(ar->drawrct.xmin - ar->winrct.xmin, ar->drawrct.ymin - ar->winrct.ymin,
-			ar->drawrct.xmax - ar->winrct.xmin, ar->drawrct.ymax - ar->winrct.ymin);
+	        ar->drawrct.xmax - ar->winrct.xmin, ar->drawrct.ymax - ar->winrct.ymin);
 	glDisable(GL_BLEND);
 #endif
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c	2013-05-14 06:10:26 UTC (rev 56785)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c	2013-05-14 06:58:35 UTC (rev 56786)
@@ -224,7 +224,7 @@
 	unsigned short *mask, *m;
 	int x, y;
 
-	mask = MEM_callocN(sizeof(unsigned short)*size*size, "brush_painter_mask");
+	mask = MEM_callocN(sizeof(unsigned short) * size * size, "brush_painter_mask");
 	m = mask;
 
 	for (y = 0; y < size; y++) {
@@ -602,7 +602,7 @@
 			do_partial_update = true;
 
 		brush_painter_2d_tex_mapping(s, size, painter->startpaintpos,
-									 pos, brush->mask_mtex.brush_map_mode, &painter->mask_mapping);
+		                             pos, brush->mask_mtex.brush_map_mode, &painter->mask_mapping);
 	}
 
 	if (do_view || do_random)

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c	2013-05-14 06:10:26 UTC (rev 56785)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c	2013-05-14 06:58:35 UTC (rev 56786)
@@ -2830,7 +2830,7 @@
 		ArrayIterator *internal = iter->internal;
 
 		if (!internal->skip) {
-			internal->ptr += internal->itemsize*(num-1);
+			internal->ptr += internal->itemsize * (num - 1);
 			iter->valid = (internal->ptr < internal->endptr);
 			if (iter->valid)
 				RNA_property_collection_next(iter);