[Bf-blender-cvs] [32a08f7fd5b] temp-T73411-view-layer-lazy-cache: Merge branch 'master' into temp-T73411-view-layer-lazy-cache

[Jeroen Bakker]

Commit: 32a08f7fd5bf7b40115e25f9b9dedf85d4236a6e
Author: Jeroen Bakker
Date:   Wed Sep 7 20:25:53 2022 +0200
Branches: temp-T73411-view-layer-lazy-cache
https://developer.blender.org/rB32a08f7fd5bf7b40115e25f9b9dedf85d4236a6e

Merge branch 'master' into temp-T73411-view-layer-lazy-cache

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



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

diff --cc source/blender/editors/object/object_modifier.cc
index be13258b23c,8bbceccab28..305e8a77ab1
--- a/source/blender/editors/object/object_modifier.cc
+++ b/source/blender/editors/object/object_modifier.cc
@@@ -2638,13 -2636,10 +2638,13 @@@ static void skin_armature_bone_create(O
    }
  }
  
 -static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, Object *skin_ob)
 +static Object *modifier_skin_armature_create(Depsgraph *depsgraph,
 +                                             Main *bmain,
 +                                             Scene *scene,
 +                                             Object *skin_ob)
  {
    Mesh *me = static_cast<Mesh *>(skin_ob->data);
-   const Span<MVert> me_verts = me->vertices();
+   const Span<MVert> me_verts = me->verts();
    const Span<MEdge> me_edges = me->edges();
  
    Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);