From 7692743deb111945278fdc5cfb4699519702ae75 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Wed, 12 Apr 2023 14:38:21 +0200 Subject: [PATCH 1/2] Release cycle: Version bump to 2.93.17 rc --- source/blender/blenkernel/BKE_blender_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 8c2ffb9fa50..8d30acbc8ca 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -33,9 +33,9 @@ extern "C" { /* Blender major and minor version. */ #define BLENDER_VERSION 293 /* Blender patch version for bugfix releases. */ -#define BLENDER_VERSION_PATCH 16 +#define BLENDER_VERSION_PATCH 17 /** Blender release cycle stage: alpha/beta/rc/release. */ -#define BLENDER_VERSION_CYCLE release +#define BLENDER_VERSION_CYCLE rc /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -- 2.30.2 From d8b89ec2117d22680636f0fffb2179c6bf37939b Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Wed, 12 Apr 2023 10:10:12 +0200 Subject: [PATCH 2/2] Fix #106794: Changing active camera changes other viewport local cameras f36543c5f552 took care of syncing multiple viewport`s cameras, but wasnt fully meeting intentions [which was to only do this if both viewports are locked to the scene camera]. Check was only done for the viewport this was executed in (if this was locked to the scene camera, it would change all other viewports as well), now also check if the target viewport prefers to use its own local camera instead and skip it in that case. Pull Request: https://projects.blender.org/blender/blender/pulls/106799 --- source/blender/editors/space_view3d/view3d_view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 2935d98c036..b4757720100 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -591,7 +591,8 @@ static void sync_viewport_camera_smoothview(bContext *C, if (other_v3d->camera == ob) { continue; } - if (v3d->scenelock) { + /* Checking the other view is needed to prevent local cameras being modified. */ + if (v3d->scenelock && other_v3d->scenelock) { ListBase *lb = (space_link == area->spacedata.first) ? &area->regionbase : &space_link->regionbase; for (ARegion *other_region = lb->first; other_region != NULL; -- 2.30.2