[Bf-blender-cvs] [55a69d5707f] master: Geometry Nodes: realize instances before deform modifier

[Jacques Lucke]

Commit: 55a69d5707ffef12a0f423ba4fa646f45af82375
Author: Jacques Lucke
Date:   Wed Feb 17 13:17:50 2021 +0100
Branches: master
https://developer.blender.org/rB55a69d5707ffef12a0f423ba4fa646f45af82375

Geometry Nodes: realize instances before deform modifier

This is a follow up commit for rB96da8e9ca302b8d879744.

Ref T85281.

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

M	source/blender/blenkernel/intern/DerivedMesh.cc

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc
index 3aef53de64e..213e72d496b 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.cc
+++ b/source/blender/blenkernel/intern/DerivedMesh.cc
@@ -1189,6 +1189,14 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph,
       /* No existing verts to deform, need to build them. */
       if (!deformed_verts) {
         if (mesh_final) {
+          Mesh *mesh_final_new = prepare_geometry_set_for_mesh_modifier(mesh_final,
+                                                                        geometry_set_final);
+          if (mesh_final_new != mesh_final) {
+            BLI_assert(mesh_final != mesh_input);
+            BKE_id_free(nullptr, mesh_final);
+            mesh_final = mesh_final_new;
+          }
+
           /* Deforming a mesh, read the vertex locations
            * out of the mesh and deform them. Once done with this
            * run of deformers verts will be written back. */