[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47957] trunk/blender/source/blender/ editors/space_clip: Style cleanup

Sergey Sharybin sergey.vfx at gmail.com
Fri Jun 15 16:11:23 CEST 2012


Revision: 47957
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47957
Author:   nazgul
Date:     2012-06-15 14:11:23 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
Style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_clip/clip_buttons.c
    trunk/blender/source/blender/editors/space_clip/clip_editor.c
    trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
    trunk/blender/source/blender/editors/space_clip/clip_utils.c
    trunk/blender/source/blender/editors/space_clip/tracking_ops.c
    trunk/blender/source/blender/editors/space_clip/tracking_select.c

Modified: trunk/blender/source/blender/editors/space_clip/clip_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_buttons.c	2012-06-15 14:11:05 UTC (rev 47956)
+++ trunk/blender/source/blender/editors/space_clip/clip_buttons.c	2012-06-15 14:11:23 UTC (rev 47957)
@@ -165,7 +165,8 @@
 
 	block = uiLayoutAbsoluteBlock(layout);
 
-	scopes->track_preview_height = (scopes->track_preview_height <= UI_UNIT_Y) ? UI_UNIT_Y : scopes->track_preview_height;
+	scopes->track_preview_height =
+		(scopes->track_preview_height <= UI_UNIT_Y) ? UI_UNIT_Y : scopes->track_preview_height;
 
 	uiDefBut(block, TRACKPREVIEW, 0, "", rect.xmin, rect.ymin, rect.xmax - rect.xmin,
 	         scopes->track_preview_height, scopes, 0, 0, 0, 0, "");

Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c	2012-06-15 14:11:05 UTC (rev 47956)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c	2012-06-15 14:11:23 UTC (rev 47957)
@@ -113,7 +113,7 @@
 		MovieClip *clip = CTX_data_edit_movieclip(C);
 
 		if (clip) {
-			SpaceClip *sc= CTX_wm_space_clip(C);
+			SpaceClip *sc = CTX_wm_space_clip(C);
 
 			return sc->mask != NULL;
 		}
@@ -250,12 +250,12 @@
 #endif
 
 	if (*aspx < *aspy) {
-		*aspy= *aspy / *aspx;
-		*aspx= 1.0f;
+		*aspy = *aspy / *aspx;
+		*aspx = 1.0f;
 	}
 	else {
-		*aspx= *aspx / *aspy;
-		*aspy= 1.0f;
+		*aspx = *aspx / *aspy;
+		*aspy = 1.0f;
 	}
 }
 
@@ -297,12 +297,12 @@
 	*aspy *= (float)h;
 
 	if (*aspx < *aspy) {
-		*aspy= *aspy / *aspx;
-		*aspx= 1.0f;
+		*aspy = *aspy / *aspx;
+		*aspx = 1.0f;
 	}
 	else {
-		*aspx= *aspx / *aspy;
-		*aspy= 1.0f;
+		*aspx = *aspx / *aspy;
+		*aspy = 1.0f;
 	}
 }
 
@@ -679,11 +679,11 @@
 {
 	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) {
-		WM_event_add_notifier(C, NC_MASK|NA_SELECTED, mask);
+		WM_event_add_notifier(C, NC_MASK | NA_SELECTED, mask);
 	}
 }

Modified: trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c	2012-06-15 14:11:05 UTC (rev 47956)
+++ trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c	2012-06-15 14:11:23 UTC (rev 47957)
@@ -88,7 +88,8 @@
 }
 
 static void tracking_segment_point_cb(void *UNUSED(userdata), MovieTrackingTrack *UNUSED(track),
-                                      MovieTrackingMarker *UNUSED(marker), int UNUSED(coord), int scene_framenr, float val)
+                                      MovieTrackingMarker *UNUSED(marker), int UNUSED(coord),
+                                      int scene_framenr, float val)
 {
 	glVertex2f(scene_framenr, val);
 }

Modified: trunk/blender/source/blender/editors/space_clip/clip_utils.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_utils.c	2012-06-15 14:11:05 UTC (rev 47956)
+++ trunk/blender/source/blender/editors/space_clip/clip_utils.c	2012-06-15 14:11:23 UTC (rev 47957)
@@ -64,9 +64,10 @@
 #include "clip_intern.h"    // own include
 
 void clip_graph_tracking_values_iterate_track(SpaceClip *sc, MovieTrackingTrack *track, void *userdata,
-                                              void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord, int scene_framenr, float val),
-                                              void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
-                                              void (*segment_end)(void *userdata))
+		void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord,
+		              int scene_framenr, float val),
+		void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
+		void (*segment_end)(void *userdata))
 {
 	MovieClip *clip = ED_space_clip(sc);
 	int width, height, coord;
@@ -122,9 +123,10 @@
 }
 
 void clip_graph_tracking_values_iterate(SpaceClip *sc, int selected_only, int include_hidden, void *userdata,
-                                        void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord, int scene_framenr, float val),
-                                        void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
-                                        void (*segment_end)(void *userdata))
+		void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker,
+		             int coord, int scene_framenr, float val),
+		void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
+		void (*segment_end)(void *userdata))
 {
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;

Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2012-06-15 14:11:05 UTC (rev 47956)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2012-06-15 14:11:23 UTC (rev 47957)
@@ -1801,7 +1801,8 @@
 	int selected_count = count_selected_bundles(C);
 
 	if (selected_count == 0) {
-		BKE_report(op->reports, RPT_ERROR, "At least one track with bundle should be selected to define origin position");
+		BKE_report(op->reports, RPT_ERROR,
+		           "At least one track with bundle should be selected to define origin position");
 
 		return OPERATOR_CANCELLED;
 	}

Modified: trunk/blender/source/blender/editors/space_clip/tracking_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_select.c	2012-06-15 14:11:05 UTC (rev 47956)
+++ trunk/blender/source/blender/editors/space_clip/tracking_select.c	2012-06-15 14:11:23 UTC (rev 47957)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_clip/tracking_ops.c
+/** \file blender/editors/space_clip/tracking_select.c
  *  \ingroup spclip
  */
 




More information about the Bf-blender-cvs mailing list