Merge branch 'master' into tmp-new-gpu-codegentmp-new-gpu-codegen

1 files changed, 6 insertions, 1 deletions

diff --git a/source/blender/blenkernel/intern/geometry_set_instances.cc b/source/blender/blenkernel/intern/geometry_set_instances.cc
index 44ffd64e475..d3c3f41779a 100644
--- a/source/blender/blenkernel/intern/geometry_set_instances.cc
+++ b/source/blender/blenkernel/intern/geometry_set_instances.cc
@@ -50,7 +50,12 @@ GeometrySet object_get_evaluated_geometry_set(const Object &object)
     return geometry_set;
   }
   if (object.runtime.geometry_set_eval != nullptr) {
-    return *object.runtime.geometry_set_eval;
+    GeometrySet geometry_set = *object.runtime.geometry_set_eval;
+    /* Ensure that subdivision is performed on the CPU. */
+    if (geometry_set.has_mesh()) {
+      add_final_mesh_as_geometry_component(object, geometry_set);
+    }
+    return geometry_set;
   }
 
   /* Otherwise, construct a new geometry set with the component based on the object type. */