From 64b10c43c4d94d83931974e61d26cae50ec49825 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 6 Sep 2022 16:34:45 +0200 Subject: Blender 3.3 release version bump. Branch is frozen now and in Bcon5. --- source/blender/blenkernel/BKE_blender_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 9cfbc5355d7..d9337199d77 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -21,7 +21,7 @@ extern "C" { /* Blender patch version for bugfix releases. */ #define BLENDER_VERSION_PATCH 0 /** Blender release cycle stage: alpha/beta/rc/release. */ -#define BLENDER_VERSION_CYCLE rc +#define BLENDER_VERSION_CYCLE release /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -- cgit v1.2.3 From 7c33d7b4b5b334ed6d9c9585367982dc02671b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20de=20Vill=C3=A8le?= Date: Mon, 12 Sep 2022 17:07:29 +0200 Subject: Fix T100918: change min value for NLAStrip start The bug was contained in BKE/intern/nla.c, where the wrong macro was used as the minimum frame value. Instead of `MINAFRAMEF`, `MINFRAMEF` was used (the former is around -10k, the latter is 0, both fp32). Differential Revision: https://developer.blender.org/D15940 --- source/blender/blenkernel/intern/nla.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 9457c20eb7d..da508ff865c 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1241,7 +1241,7 @@ static NlaStrip *nlastrip_find_active(ListBase /* NlaStrip */ *strips) float BKE_nlastrip_compute_frame_from_previous_strip(NlaStrip *strip) { - float limit_prev = MINFRAMEF; + float limit_prev = MINAFRAMEF; /* Find the previous end frame, with a special case if the previous strip was a transition : */ if (strip->prev) { -- cgit v1.2.3