[Bf-blender-cvs] [903b786f69a] refactor-vertex-group-names: Merge branch 'master' into refactor-vertex-group-names

[Hans Goudey]

Commit: 903b786f69af342c5eda5c58ab25d827369c09cb
Author: Hans Goudey
Date:   Tue Jul 13 11:48:37 2021 -0400
Branches: refactor-vertex-group-names
https://developer.blender.org/rB903b786f69af342c5eda5c58ab25d827369c09cb

Merge branch 'master' into refactor-vertex-group-names

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_blender_version.h
index 9d286b94b04,e5217c6692b..dffd70c077f
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -39,7 -39,7 +39,7 @@@ extern "C" 
  
  /* Blender file format version. */
  #define BLENDER_FILE_VERSION BLENDER_VERSION
- #define BLENDER_FILE_SUBVERSION 8
 -#define BLENDER_FILE_SUBVERSION 10
++#define BLENDER_FILE_SUBVERSION 11
  
  /* 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 --cc source/blender/blenloader/intern/versioning_300.c
index 17f94e1e2b1,1e80510ef03..3c58c29c162
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -33,8 -34,9 +34,10 @@@
  #include "DNA_modifier_types.h"
  #include "DNA_text_types.h"
  
+ #include "BKE_action.h"
  #include "BKE_animsys.h"
+ #include "BKE_collection.h"
 +#include "BKE_deform.h"
  #include "BKE_fcurve_driver.h"
  #include "BKE_lib_id.h"
  #include "BKE_main.h"
@@@ -145,10 -134,6 +148,10 @@@ void do_versions_after_linking_300(Mai
      assert_sorted_ids(bmain);
    }
  
-   if (!MAIN_VERSION_ATLEAST(bmain, 300, 8)) {
++  if (!MAIN_VERSION_ATLEAST(bmain, 300, 11)) {
 +    move_vertex_group_names_to_object_data(bmain);
 +  }
 +
    /**
     * Versioning code until next subversion bump goes here.
     *
diff --cc source/blender/editors/mesh/editmesh_select.c
index 132a442343c,3304a1c8683..830c9abb41e
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@@ -35,7 -35,7 +35,8 @@@
  #include "BLI_utildefines_stack.h"
  
  #include "BKE_context.h"
+ #include "BKE_customdata.h"
 +#include "BKE_deform.h"
  #include "BKE_editmesh.h"
  #include "BKE_layer.h"
  #include "BKE_report.h"
diff --cc source/blender/editors/mesh/editmesh_select_similar.c
index f52ab48785d,c48e0fdc52b..c452f7a7487
--- a/source/blender/editors/mesh/editmesh_select_similar.c
+++ b/source/blender/editors/mesh/editmesh_select_similar.c
@@@ -29,7 -29,7 +29,8 @@@
  #include "BLI_math.h"
  
  #include "BKE_context.h"
+ #include "BKE_customdata.h"
 +#include "BKE_deform.h"
  #include "BKE_editmesh.h"
  #include "BKE_layer.h"
  #include "BKE_material.h"
diff --cc source/blender/modifiers/intern/MOD_nodes.cc
index bee74bcbf73,9af2472f2c6..87fce26c45e
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@@ -1078,12 -1018,15 +1018,14 @@@ static void modifyGeometry(ModifierDat
  static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
  {
    GeometrySet geometry_set = GeometrySet::create_with_mesh(mesh, GeometryOwnershipType::Editable);
 -  geometry_set.get_component_for_write<MeshComponent>().copy_vertex_group_names_from_object(
 -      *ctx->object);
 +
    modifyGeometry(md, ctx, geometry_set);
  
-   /* This function is only called when applying modifiers. In this case it makes sense to realize
-    * instances, otherwise in some cases there might be no results when applying the modifier. */
-   geometry_set = blender::bke::geometry_set_realize_mesh_for_modifier(geometry_set);
+   if (ctx->flag & MOD_APPLY_TO_BASE_MESH) {
+     /* In this case it makes sense to realize instances, otherwise in some cases there might be no
+      * results when applying the modifier. */
+     geometry_set = blender::bke::geometry_set_realize_mesh_for_modifier(geometry_set);
+   }
  
    Mesh *new_mesh = geometry_set.get_component_for_write<MeshComponent>().release();
    if (new_mesh == nullptr) {