griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Camera tracking integration

Browse Source 
===========================

- Fixed crash when Display->Stable is enabled before
  loading clip.
- Fixed bug with location influence on stabilization data.
This commit is contained in:
Sergey Sharybin
2011-08-03 19:05:58 +00:00
parent a28867e172
commit f56590a5f5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/tracking.c
View File

@@ -1308,7 +1308,6 @@ static float stabilization_auto_scale_factor(MovieTracking *tracking)
static void calculate_stabdata(MovieTrackingStabilization *stab, float width, float height,
float firstmedian[2], float curmedian[2], float loc[2], float *scale)
{
mul_v2_fl(loc, stab->locinf);
*scale= (stab->scale-1.f)*stab->scaleinf+1.f;
loc[0]= (firstmedian[0]-curmedian[0])*width*(*scale);
@@ -1316,8 +1315,11 @@ static void calculate_stabdata(MovieTrackingStabilization *stab, float width, fl
loc[0]-= (firstmedian[0]*(*scale)-firstmedian[0])*width;
loc[1]-= (firstmedian[1]*(*scale)-firstmedian[1])*height;
mul_v2_fl(loc, stab->locinf);
}
static ImBuf* stabilize_acquire_ibuf(ImBuf *cacheibuf, ImBuf *srcibuf, int fill)
{
int flags;

7
source/blender/editors/space_clip/space_clip.c
View File

@@ -88,9 +88,12 @@ static void clip_stabilization_tag_refresh(ScrArea *sa)
{
SpaceClip *sc= (SpaceClip *)sa->spacedata.first;
MovieClip *clip= ED_space_clip(sc);
MovieTrackingStabilization *stab= &clip->tracking.stabilization;
stab->ok= 0;
if(clip) {
MovieTrackingStabilization *stab= &clip->tracking.stabilization;
stab->ok= 0;
}
}
/* ******************** default callbacks for clip space ***************** */