svn merge ^/trunk/blender -r46300:46330
[blender.git] / source / blender / blenkernel / intern / movieclip.c
index 849dbd83366b9c156f4c1e23bffd9f8725898a35..964a20659e07d4975dfbc5527c9a1c340a1e1893 100644 (file)
@@ -155,7 +155,7 @@ static void get_sequence_fname(MovieClip *clip, int framenr, char *name)
 
        /* 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 @@ static ImBuf *movieclip_load_sequence_file(MovieClip *clip, MovieClipUser *user,
 {
        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 @@ static MovieClip *movieclip_alloc(const char *name)
 
        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);
 
@@ -660,7 +660,7 @@ static ImBuf *put_postprocessed_frame_to_cache(MovieClip *clip, MovieClipUser *u
                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 @@ static ImBuf *movieclip_get_postprocessed_ibuf(MovieClip *clip, MovieClipUser *u
 
        /* 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 @@ static ImBuf *put_stabilized_frame_to_cache(MovieClip *clip, MovieClipUser *user
 
        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 @@ ImBuf *BKE_movieclip_get_stable_ibuf(MovieClip *clip, MovieClipUser *user, float
                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 @@ ImBuf *BKE_movieclip_get_stable_ibuf(MovieClip *clip, MovieClipUser *user, float
                        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 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
 
                                        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 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
                                        }
 
                                        /* 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);
                                }