Revision: 46819
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46819
Author: genscher
Date: 2012-05-20 20:59:01 +0000 (Sun, 20 May 2012)
Log Message:
-----------
leftover from merge
Modified Paths:
--------------
branches/smoke2/source/blender/blenkernel/intern/movieclip.c
Modified: branches/smoke2/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/smoke2/source/blender/blenkernel/intern/movieclip.c
2012-05-20 19:49:27 UTC (rev 46818)
+++ branches/smoke2/source/blender/blenkernel/intern/movieclip.c
2012-05-20 20:59:01 UTC (rev 46819)
@@ -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 = FALSE;
use_proxy = (flag & MCLIP_USE_PROXY) && user->render_size !=
MCLIP_PROXY_RENDER_SIZE_FULL;
if (use_proxy) {
@@ -432,7 +432,7 @@
clip = BKE_libblock_alloc(&G.main->movieclip, ID_MC, name);
- clip->aspx = clip->aspy= 1.0f;
+ clip->aspx = clip->aspy = 1.0f;
BKE_tracking_init_settings(&clip->tracking);
@@ -661,7 +661,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;
@@ -705,14 +705,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;
@@ -826,7 +826,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);
@@ -864,7 +864,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);
@@ -875,20 +875,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;
}
@@ -1046,7 +1046,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);
@@ -1060,14 +1060,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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
