[Bf-blender-cvs] [c2750c89cbc] temp-vse-preview-transform2: Fix incorrect origin range
Richard Antalik
noreply at git.blender.org
Wed Sep 15 17:19:57 CEST 2021
Commit: c2750c89cbcc824520e6a2e9ce827a4db2a42a67
Author: Richard Antalik
Date: Tue Sep 14 11:50:42 2021 +0200
Branches: temp-vse-preview-transform2
https://developer.blender.org/rBc2750c89cbcc824520e6a2e9ce827a4db2a42a67
Fix incorrect origin range
===================================================================
M source/blender/blenloader/intern/versioning_300.c
M source/blender/sequencer/intern/strip_transform.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 9114bd7ae80..51037db2e0c 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -768,7 +768,9 @@ static void version_geometry_nodes_change_legacy_names(bNodeTree *ntree)
static bool seq_transform_origin_set(Sequence *seq, void *UNUSED(user_data))
{
StripTransform *transform = seq->strip->transform;
- transform->origin[0] = transform->origin[1] = 0.5f;
+ if (seq->strip->transform != NULL) {
+ transform->origin[0] = transform->origin[1] = 0.5f;
+ }
return true;
}
diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c
index 9e774833044..2df6972b6bd 100644
--- a/source/blender/sequencer/intern/strip_transform.c
+++ b/source/blender/sequencer/intern/strip_transform.c
@@ -440,7 +440,7 @@ void SEQ_image_transform_origin_offset_get(const Scene *scene,
image_size[1] = scene->r.ysch;
}
else {
- image_size[0] = strip_elem->orig_height;
+ image_size[0] = strip_elem->orig_width;
image_size[1] = strip_elem->orig_height;
}
More information about the Bf-blender-cvs
mailing list