Merge tag 'v2.91.0' into blender-v2.91-release-mac-arm

Tagging Blender 2.91.0 Release
skwerner · Nov 25, 2020 · 249c5bb · 249c5bb
2 parents f3bbe48 + b50598b
commit 249c5bb
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 12 deletions.
diff --git a/release/freedesktop/org.blender.Blender.appdata.xml b/release/freedesktop/org.blender.Blender.appdata.xml
@@ -40,6 +40,30 @@
         </screenshot>
     </screenshots>
     <releases>
+        <release version="2.91" date="2020-11-25">
+            <description>
+                <p>New features:</p>
+                <ul>
+                    <li>Volume modifiers</li>
+                    <li>Precise boolean</li>
+                    <li>Cloth brush collision</li>
+                    <li>Custom curve bevels</li>
+                    <li>Grease Pencil image tracer</li>
+                    <li>Property search and fuzzy search</li>
+                </ul>
+                <p>Enhancements:</p>
+                <ul>
+                    <li>Boundary and pose cloth brushes</li>
+                    <li>Material holdout for Grease Pencil</li>
+                    <li>Sculpting gestures</li>
+                    <li>Overrides resync and transform support</li>
+                    <li>Animation proxy conversion</li>
+                    <li>Compound shape collision</li>
+                    <li>Outliner collection colors</li>
+                    <li>Snappier F-Curves and seamless keyframe insertion</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.90" date="2020-08-31">
             <description>
                 <p>New features:</p>

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
@@ -35,11 +35,11 @@ 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
-#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/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");

diff --git 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

diff --git 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;

diff --git 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) {