blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Sergey Sharybin 2022-11-17 17:51:23 +01:00
parent ca253df623 52c3214776
commit 609a681fb5
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/blenkernel/intern/movieclip.c
View File

@ -937,15 +937,22 @@ static void movieclip_load_get_size(MovieClip *clip)
user.framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, 1);
BKE_movieclip_get_size(clip, &user, &width, &height);
if (width && height) {
clip->tracking.camera.principal[0] = ((float)width) / 2.0f;
clip->tracking.camera.principal[1] = ((float)height) / 2.0f;
}
else {
if (!width || !height) {
clip->lastsize[0] = clip->lastsize[1] = IMG_SIZE_FALLBACK;
}
}
static void movieclip_principal_to_center(MovieClip *clip)
{
MovieClipUser user = *DNA_struct_default_get(MovieClipUser);
int width, height;
BKE_movieclip_get_size(clip, &user, &width, &height);
clip->tracking.camera.principal[0] = ((float)width) / 2.0f;
clip->tracking.camera.principal[1] = ((float)height) / 2.0f;
}
static void detect_clip_source(Main *bmain, MovieClip *clip)
{
ImBuf *ibuf;
@ -995,6 +1002,7 @@ MovieClip *BKE_movieclip_file_add(Main *bmain, const char *name)
clip->tracking.camera.focal = 24.0f * width / clip->tracking.camera.sensor_width;
}
movieclip_principal_to_center(clip);
movieclip_calc_length(clip);
return clip;
@ -1672,11 +1680,26 @@ void BKE_movieclip_reload(Main *bmain, MovieClip *clip)
/* update clip source */
detect_clip_source(bmain, clip);
clip->lastsize[0] = clip->lastsize[1] = 0;
movieclip_load_get_size(clip);
const int old_width = clip->lastsize[0];
const int old_height = clip->lastsize[1];
/* Tag for re-calculation of the actual size. */
clip->lastsize[0] = clip->lastsize[1] = 0;
movieclip_load_get_size(clip);
movieclip_calc_length(clip);
int width, height;
MovieClipUser user = *DNA_struct_default_get(MovieClipUser);
BKE_movieclip_get_size(clip, &user, &width, &height);
/* If the resolution changes then re-initialize the principal point.
* Ideally the principal point will be in some sort of relative space, but this is not how it is
* designed currently. The code should cover the most of the common cases. */
if (width != old_width || height != old_height) {
movieclip_principal_to_center(clip);
}
BKE_ntree_update_tag_id_changed(bmain, &clip->id);
}