[Bf-blender-cvs] [22fdb88be52] master: Merge branch 'blender-v3.3-release'

[Philipp Oeser]

Commit: 22fdb88be525fbefb77c17fe69956e1e367c747e
Author: Philipp Oeser
Date:   Tue Aug 23 11:19:08 2022 +0200
Branches: master
https://developer.blender.org/rB22fdb88be525fbefb77c17fe69956e1e367c747e

Merge branch 'blender-v3.3-release'

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



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

diff --cc source/blender/modifiers/intern/MOD_surfacedeform.c
index 3c0842a6e93,5ed9c698390..96e761e86b6
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@@ -1599,9 -1600,14 +1599,14 @@@ static void deformVertsEM(ModifierData 
  
    if (smd->defgrp_name[0] != '\0') {
      /* Only need to use mesh_src when a vgroup is used. */
 -    mesh_src = MOD_deform_mesh_eval_get(ctx->object, em, mesh, NULL, verts_num, false, false);
 +    mesh_src = MOD_deform_mesh_eval_get(ctx->object, em, mesh, NULL, verts_num, false);
    }
  
+   /* TODO(@campbellbarton): use edit-mode data only (remove this line). */
+   if (mesh_src != NULL) {
+     BKE_mesh_wrapper_ensure_mdata(mesh_src);
+   }
+ 
    surfacedeformModifier_do(md, ctx, vertexCos, verts_num, ctx->object, mesh_src);
  
    if (!ELEM(mesh_src, NULL, mesh)) {