[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46252] trunk/blender/source/blender: Style cleanup: spaces around operators
Sergey Sharybin
sergey.vfx at gmail.com
Fri May 4 01:47:40 CEST 2012
Revision: 46252
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46252
Author: nazgul
Date: 2012-05-03 23:47:39 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Style cleanup: spaces around operators
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/editors/space_clip/clip_buttons.c
trunk/blender/source/blender/editors/space_clip/clip_draw.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_graph_ops.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/clip_utils.c
trunk/blender/source/blender/editors/space_clip/space_clip.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/imbuf/intern/moviecache.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-05-03 23:41:28 UTC (rev 46251)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-05-03 23:47:39 UTC (rev 46252)
@@ -155,7 +155,7 @@
/* movieclips always points to first image from sequence,
* autoguess offset for now. could be something smarter in the future */
- offset= sequence_guess_offset(clip->name, strlen(head), numlen);
+ offset = sequence_guess_offset(clip->name, strlen(head), numlen);
if (numlen)
BLI_stringenc(name, head, tail, numlen, offset + framenr - 1);
@@ -195,7 +195,7 @@
{
struct ImBuf *ibuf;
char name[FILE_MAX];
- int loadflag, use_proxy= 0;
+ int loadflag, use_proxy = 0;
use_proxy = (flag & MCLIP_USE_PROXY) && user->render_size != MCLIP_PROXY_RENDER_SIZE_FULL;
if (use_proxy) {
@@ -432,7 +432,7 @@
clip = alloc_libblock(&G.main->movieclip, ID_MC, name);
- clip->aspx = clip->aspy= 1.0f;
+ clip->aspx = clip->aspy = 1.0f;
BKE_tracking_init_settings(&clip->tracking);
@@ -660,7 +660,7 @@
copy_v2_v2(cache->postprocessed.principal, camera->principal);
copy_v3_v3(&cache->postprocessed.k1, &camera->k1);
cache->postprocessed.undistoriton_used = TRUE;
- postproc_ibuf= get_undistorted_ibuf(clip, NULL, ibuf);
+ postproc_ibuf = get_undistorted_ibuf(clip, NULL, ibuf);
}
else {
cache->postprocessed.undistoriton_used = FALSE;
@@ -704,14 +704,14 @@
/* try to obtain cached postprocessed frame first */
if (need_postprocessed_frame(user, flag, postprocess_flag)) {
- ibuf= get_postprocessed_cached_frame(clip, user, flag, postprocess_flag);
+ ibuf = get_postprocessed_cached_frame(clip, user, flag, postprocess_flag);
if (!ibuf)
need_postprocess = TRUE;
}
if (!ibuf)
- ibuf= get_imbuf_cache(clip, user, flag);
+ ibuf = get_imbuf_cache(clip, user, flag);
if (!ibuf) {
int use_sequence = FALSE;
@@ -825,7 +825,7 @@
stableibuf = BKE_tracking_stabilize(&clip->tracking, framenr, ibuf, tloc, &tscale, &tangle);
- cache->stabilized.ibuf= stableibuf;
+ cache->stabilized.ibuf = stableibuf;
copy_v2_v2(cache->stabilized.loc, tloc);
@@ -862,7 +862,7 @@
return NULL;
if (clip->tracking.stabilization.flag & TRACKING_2D_STABILIZATION) {
- MovieClipCache *cache= clip->cache;
+ MovieClipCache *cache = clip->cache;
stableibuf = get_stable_cached_frame(clip, user, framenr, postprocess_flag);
@@ -873,20 +873,20 @@
copy_v2_v2(loc, cache->stabilized.loc);
if (scale)
- *scale= cache->stabilized.scale;
+ *scale = cache->stabilized.scale;
if (angle)
- *angle= cache->stabilized.angle;
+ *angle = cache->stabilized.angle;
}
else {
if (loc)
zero_v2(loc);
if (scale)
- *scale= 1.0f;
+ *scale = 1.0f;
if (angle)
- *angle= 0.0f;
+ *angle = 0.0f;
stableibuf = ibuf;
}
@@ -1044,7 +1044,7 @@
if (user->render_flag & MCLIP_PROXY_RENDER_UNDISTORT) {
int width, height;
- float aspy= 1.0f / clip->tracking.camera.pixel_aspect;
+ float aspy = 1.0f / clip->tracking.camera.pixel_aspect;
BKE_movieclip_get_size(clip, user, &width, &height);
@@ -1058,14 +1058,14 @@
}
/* NOTE: margin should be kept in sync with value from ui_draw_but_TRACKPREVIEW */
- tmpibuf= BKE_tracking_get_pattern_imbuf(ibuf, track, &undist_marker, 3 /* margin */,
+ tmpibuf = BKE_tracking_get_pattern_imbuf(ibuf, track, &undist_marker, 3 /* margin */,
1 /* anchor */, scopes->track_pos, NULL);
if (tmpibuf->rect_float)
IMB_rect_from_float(tmpibuf);
if (tmpibuf->rect)
- scopes->track_preview= tmpibuf;
+ scopes->track_preview = tmpibuf;
else
IMB_freeImBuf(tmpibuf);
}
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-05-03 23:41:28 UTC (rev 46251)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-05-03 23:47:39 UTC (rev 46252)
@@ -107,7 +107,7 @@
float max_pyramid_level_factor = 1.0;
if (track->tracker == TRACKER_KLT) {
- max_pyramid_level_factor= 1 << (track->pyramid_levels - 1);
+ max_pyramid_level_factor = 1 << (track->pyramid_levels - 1);
}
/* sort */
@@ -277,7 +277,7 @@
MovieTrackingMarker *BKE_tracking_insert_marker(MovieTrackingTrack *track, MovieTrackingMarker *marker)
{
- MovieTrackingMarker *old_marker= NULL;
+ MovieTrackingMarker *old_marker = NULL;
if (track->markersnr)
old_marker = BKE_tracking_exact_marker(track, marker->framenr);
@@ -313,7 +313,7 @@
void BKE_tracking_delete_marker(MovieTrackingTrack *track, int framenr)
{
- int a= 0;
+ int a = 0;
while (a<track->markersnr) {
if (track->markers[a].framenr == framenr) {
@@ -464,7 +464,7 @@
put_disabled_marker(track, &track->markers[track->markersnr-1], 0, 1);
}
else if (action == TRACK_CLEAR_UPTO) {
- a= track->markersnr-1;
+ a = track->markersnr-1;
while (a >= 0) {
if (track->markers[a].framenr <= ref_frame) {
@@ -786,7 +786,7 @@
static void tracks_map_insert(TracksMap *map, MovieTrackingTrack *track, void *customdata)
{
- MovieTrackingTrack new_track= *track;
+ MovieTrackingTrack new_track = *track;
new_track.markers = MEM_dupallocN(new_track.markers);
@@ -866,10 +866,10 @@
BLI_ghash_insert(map->hash, track, new_track);
if (replace_sel) /* update current selection in clip */
- tracking->act_track= new_track;
+ tracking->act_track = new_track;
if (replace_rot) /* update track used for rotation stabilization */
- tracking->stabilization.rot_track= new_track;
+ tracking->stabilization.rot_track = new_track;
BLI_addtail(&tracks, new_track);
}
@@ -882,7 +882,7 @@
track->next = track->prev = NULL;
BLI_addtail(&new_tracks, track);
- track= next;
+ track = next;
}
/* now move all tracks which are currently operating and keep their names unique */
@@ -897,15 +897,15 @@
BLI_uniquename(&new_tracks, track, "Track", '.', offsetof(MovieTrackingTrack, name), sizeof(track->name));
- track= next;
+ track = next;
}
- *old_tracks= new_tracks;
+ *old_tracks = new_tracks;
}
static void tracks_map_free(TracksMap *map, void (*customdata_free) (void *customdata))
{
- int i= 0;
+ int i = 0;
BLI_ghash_free(map->hash, NULL, NULL);
@@ -1021,7 +1021,7 @@
* than the search size */
int level = MIN2(track->pyramid_levels, max_pyramid_levels);
- if (track->tracker==TRACKER_KLT) {
+ if (track->tracker == TRACKER_KLT) {
track_context.region_tracker =
libmv_pyramidRegionTrackerNew(100, level, half_wnd, track->minimum_correlation);
}
@@ -1030,7 +1030,7 @@
libmv_hybridRegionTrackerNew(100, half_wnd, track->minimum_correlation);
}
else if (track->tracker == TRACKER_SAD) {
- track_context.region_tracker= libmv_bruteRegionTrackerNew(MAX2(wndx, wndy), track->minimum_correlation);
+ track_context.region_tracker = libmv_bruteRegionTrackerNew(MAX2(wndx, wndy), track->minimum_correlation);
}
}
#endif
@@ -1053,7 +1053,7 @@
* - MCLIP_USE_PROXY_CUSTOM_DIR is needed because proxy/timecode files might
* be stored in a different location
* ignore all the rest possible flags for now */
- context->clip_flag = clip->flag&MCLIP_TIMECODE_FLAGS;
+ context->clip_flag = clip->flag & MCLIP_TIMECODE_FLAGS;
context->user = *user;
context->user.render_size = MCLIP_PROXY_RENDER_SIZE_FULL;
@@ -1321,7 +1321,7 @@
MovieTrackingMarker *next_marker = NULL;
if (next>=0 && next<track->markersnr)
- next_marker= &track->markers[next];
+ next_marker = &track->markers[next];
/* if next mrker is disabled, stop searching keyframe and use current frame as keyframe */
if (next_marker && next_marker->flag & MARKER_DISABLED)
@@ -1498,7 +1498,7 @@
}
marker_new.flag |= MARKER_TRACKED;
- marker_new.framenr= nextfra;
+ marker_new.framenr = nextfra;
#pragma omp critical
{
@@ -1757,7 +1757,7 @@
static int count_tracks_on_both_keyframes(MovieTracking *tracking, ListBase *tracksbase)
{
int tot = 0;
- int frame1 = tracking->settings.keyframe1, frame2= tracking->settings.keyframe2;
+ int frame1 = tracking->settings.keyframe1, frame2 = tracking->settings.keyframe2;
MovieTrackingTrack *track;
track = tracksbase->first;
@@ -1888,7 +1888,7 @@
#ifdef WITH_LIBMV
static void solve_reconstruction_update_cb(void *customdata, double progress, const char *message)
{
- ReconstructProgressData *progressdata= customdata;
+ ReconstructProgressData *progressdata = customdata;
if (progressdata->progress) {
*progressdata->progress = progress;
@@ -2004,7 +2004,7 @@
static int reconstruction_camera_index(MovieTrackingReconstruction *reconstruction, int framenr, int nearest)
{
- MovieReconstructedCamera *cameras= reconstruction->cameras;
+ MovieReconstructedCamera *cameras = reconstruction->cameras;
int a = 0, d = 1;
if (!reconstruction->camnr)
@@ -2241,7 +2241,7 @@
if (object->flag & TRACKING_OBJECT_CAMERA)
return object;
- object= object->next;
+ object = object->next;
}
return NULL;
@@ -2274,7 +2274,7 @@
void BKE_tracking_apply_intrinsics(MovieTracking *tracking, float co[2], float nco[2])
{
- MovieTrackingCamera *camera= &tracking->camera;
+ MovieTrackingCamera *camera = &tracking->camera;
#ifdef WITH_LIBMV
double x, y;
@@ -2334,7 +2334,7 @@
count++;
}
- prev= i;
+ prev = i;
}
return count % 2;
@@ -2443,10 +2443,10 @@
track = track->next;
}
- object= object->next;
+ object = object->next;
}
- *tracksbase_r= NULL;
+ *tracksbase_r = NULL;
return NULL;
}
@@ -2670,8 +2670,8 @@
if ((stab->flag & TRACKING_2D_STABILIZATION) == 0) {
zero_v2(loc);
- *scale= 1.0f;
- *angle= 0.0f;
+ *scale = 1.0f;
+ *angle = 0.0f;
return;
}
@@ -2790,10 +2790,10 @@
copy_v2_v2(loc, tloc);
if (scale)
- *scale= tscale;
+ *scale = tscale;
if (angle)
- *angle= tangle;
+ *angle = tangle;
return tmpibuf;
}
@@ -3026,7 +3026,7 @@
if (track == tracking->act_track)
tracking->act_track = NULL;
- track= track->next;
+ track = track->next;
}
tracking_object_free(object);
Modified: trunk/blender/source/blender/editors/space_clip/clip_buttons.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list