From aca8eadb63ebbeb0b53b114ebba6cea7d1e460c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 24 Nov 2020 11:13:43 +0100 Subject: [PATCH 1/6] Animation: Remove debug prints Remove accidentally-commited debug prints. No functional changes. Reviewed by: sergey Differential Revision: https://developer.blender.org/D9637 --- source/blender/editors/animation/anim_channels_edit.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 360335a54d7..6c3018749f7 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2683,12 +2683,8 @@ static int animchannels_box_select_exec(bContext *C, wmOperator *op) WM_operator_properties_border_to_rcti(op, &rect); if (!extend) { - printf("\n\n\n\033[92mBox-selecting channels without extend!\033[0m\n"); ANIM_anim_channels_select_set(&ac, ACHANNEL_SETFLAG_CLEAR); } - else { - printf("\n\n\n\033[91mBox-selecting channels WITH extend!\033[0m\n"); - } if (select) { selectmode = ACHANNEL_SETFLAG_ADD; From bb5c4de00973ee9723c769174930b181cbc256c0 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 24 Nov 2020 11:18:24 +0100 Subject: [PATCH 2/6] Fix T82962: Crash changing lattice resolution with Vertex Group Regression introduced by {rB042143440d76}. The deform group lookup was performed on the wrong object. Before the lookup was performed on the lattice object. This patch changes this back. Reviewed By: Bastien Montagne Differential Revision: https://developer.blender.org/D9638 --- source/blender/blenkernel/intern/lattice_deform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/lattice_deform.c b/source/blender/blenkernel/intern/lattice_deform.c index 382661ff070..685241a079d 100644 --- a/source/blender/blenkernel/intern/lattice_deform.c +++ b/source/blender/blenkernel/intern/lattice_deform.c @@ -117,7 +117,7 @@ LatticeDeformData *BKE_lattice_deform_data_create(const Object *oblatt, const Ob int defgrp_index = -1; const MDeformVert *dvert = BKE_lattice_deform_verts_get(oblatt); if (lt->vgroup[0] && dvert) { - defgrp_index = BKE_object_defgroup_name_index(ob, lt->vgroup); + defgrp_index = BKE_object_defgroup_name_index(oblatt, lt->vgroup); if (defgrp_index != -1) { lattice_weights = MEM_malloc_arrayN(sizeof(float), num_points, "lattice_weights"); From 31bf8307afc0fb995afcf2233dc50c28b531778d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 24 Nov 2020 12:27:43 +0100 Subject: [PATCH 3/6] Graph Editor: fix keyframe not activating in certain cases When clicking on an already-selected keyframe, mark it as active if the click caused the previously-active keyframe to become deselected. When clicking on a key in the graph editor, it is selected and all other keys are deselected. If that key was already selected before the click, it would not become the active keyframe. This is now fixed. Reviewed by: Severin Differential Revision: https://developer.blender.org/D9639 --- source/blender/editors/space_graph/graph_select.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index ba684972dd7..13f2219d7af 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -1518,8 +1518,13 @@ static int mouse_graph_keys(bAnimContext *ac, something_was_selected = true; } - if (!run_modal && BEZT_ISSEL_ANY(bezt) && !already_selected) { - BKE_fcurve_active_keyframe_set(nvi->fcu, bezt); + if (!run_modal && BEZT_ISSEL_ANY(bezt)) { + const bool may_activate = !already_selected || + BKE_fcurve_active_keyframe_index(nvi->fcu) == + FCURVE_ACTIVE_KEYFRAME_NONE; + if (may_activate) { + BKE_fcurve_active_keyframe_set(nvi->fcu, bezt); + } } } else if (nvi->fpt) { From 787af651a7ee82a5ba48fbccd1a3e3b66ac74edb Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 25 Nov 2020 09:27:16 +0100 Subject: [PATCH 4/6] File version bump --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_userdef.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 741abb50453..cc7270c8ee0 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -39,7 +39,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 9 +#define BLENDER_FILE_SUBVERSION 10 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index f76fac23e96..bdcab6ecbb3 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -246,6 +246,12 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_graph.vertex_active); } + if (!USER_VERSION_ATLEAST(291, 10)) { + for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) { + FROM_DEFAULT_V4_UCHAR(collection_color[i].color); + } + } + /** * Versioning code until next subversion bump goes here. * @@ -257,9 +263,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) */ { /* Keep this block, even when empty. */ - for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) { - FROM_DEFAULT_V4_UCHAR(collection_color[i].color); - } } #undef FROM_DEFAULT_V4_UCHAR From 0f45cab862b88c0ab0ec6878bd782820c277d7df Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 25 Nov 2020 09:34:47 +0100 Subject: [PATCH 5/6] Versionbump: Blender 2.91 release --- source/blender/blenkernel/BKE_blender_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index cc7270c8ee0..95bc8f39b4f 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -35,7 +35,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 beta +#define BLENDER_VERSION_CYCLE release /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION From b50598bc78c74634113b4dc08a024828f5aadc97 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 25 Nov 2020 12:06:48 +0100 Subject: [PATCH 6/6] Docs: 2.91 release description for Linux appdata --- .../org.blender.Blender.appdata.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/release/freedesktop/org.blender.Blender.appdata.xml b/release/freedesktop/org.blender.Blender.appdata.xml index edadf9d7438..33a40a07bf1 100644 --- a/release/freedesktop/org.blender.Blender.appdata.xml +++ b/release/freedesktop/org.blender.Blender.appdata.xml @@ -40,6 +40,30 @@ + + +

New features:

+
    +
  • Volume modifiers
    • +
  • Precise boolean
    • +
  • Cloth brush collision
    • +
  • Custom curve bevels
    • +
  • Grease Pencil image tracer
    • +
  • Property search and fuzzy search
    • +
+

Enhancements:

+
    +
  • Boundary and pose cloth brushes
    • +
  • Material holdout for Grease Pencil
    • +
  • Sculpting gestures
    • +
  • Overrides resync and transform support
    • +
  • Animation proxy conversion
    • +
  • Compound shape collision
    • +
  • Outliner collection colors
    • +
  • Snappier F-Curves and seamless keyframe insertion
    • +
+ +

New features: