[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44179] trunk/blender: Camera tracking: fix for missing cache invalidation when disabling/ enabling channels for stabilized shot
Sergey Sharybin
sergey.vfx at gmail.com
Fri Feb 17 09:16:30 CET 2012
Revision: 44179
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44179
Author: nazgul
Date: 2012-02-17 08:16:29 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
Camera tracking: fix for missing cache invalidation when disabling/enabling channels for stabilized shot
--
svn merge -r44140:44141 ^/branches/soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44140
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/movieclip.c
Property Changed:
----------------
trunk/blender/
trunk/blender/source/blender/editors/space_outliner/
Property changes on: trunk/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-02-17 08:13:45 UTC (rev 44178)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-02-17 08:16:29 UTC (rev 44179)
@@ -277,6 +277,7 @@
struct {
ImBuf *ibuf;
int framenr;
+ int postprocess_flag;
float loc[2], scale, angle;
int proxy;
@@ -702,7 +703,7 @@
return movieclip_get_postprocessed_ibuf(clip, user, clip->flag, postprocess_flag, 0);
}
-static ImBuf *get_stable_cached_frame(MovieClip *clip, MovieClipUser *user, int framenr)
+static ImBuf *get_stable_cached_frame(MovieClip *clip, MovieClipUser *user, int framenr, int postprocess_flag)
{
MovieClipCache *cache = clip->cache;
ImBuf *stableibuf;
@@ -723,6 +724,9 @@
if(cache->stabilized.render_flag!=render_flag || cache->stabilized.proxy!=proxy)
return NULL;
+ if(cache->stabilized.postprocess_flag != postprocess_flag)
+ return NULL;
+
stableibuf = cache->stabilized.ibuf;
BKE_tracking_stabilization_data(&clip->tracking, framenr, stableibuf->x, stableibuf->y, tloc, &tscale, &tangle);
@@ -740,7 +744,8 @@
return stableibuf;
}
-static ImBuf *put_stabilized_frame_to_cache(MovieClip *clip, MovieClipUser *user, ImBuf *ibuf, int framenr)
+static ImBuf *put_stabilized_frame_to_cache(MovieClip *clip, MovieClipUser *user, ImBuf *ibuf,
+ int framenr, int postprocess_flag)
{
MovieClipCache *cache = clip->cache;
ImBuf *stableibuf;
@@ -768,6 +773,8 @@
cache->stabilized.render_flag = 0;
}
+ cache->stabilized.postprocess_flag = postprocess_flag;
+
IMB_refImBuf(stableibuf);
return stableibuf;
@@ -786,10 +793,10 @@
if(clip->tracking.stabilization.flag&TRACKING_2D_STABILIZATION) {
MovieClipCache *cache= clip->cache;
- stableibuf= get_stable_cached_frame(clip, user, framenr);
+ stableibuf= get_stable_cached_frame(clip, user, framenr, postprocess_flag);
if(!stableibuf)
- stableibuf= put_stabilized_frame_to_cache(clip, user, ibuf, framenr);
+ stableibuf= put_stabilized_frame_to_cache(clip, user, ibuf, framenr, postprocess_flag);
if(loc) copy_v2_v2(loc, cache->stabilized.loc);
if(scale) *scale= cache->stabilized.scale;
Property changes on: trunk/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141
More information about the Bf-blender-cvs
mailing list