[Bf-blender-cvs] [216387070f9] temp-modifiers-instancing: support geometry output in object info node

[Jacques Lucke]

Commit: 216387070f9cf3e2ce575ace9fad264b5ee133dc
Author: Jacques Lucke
Date:   Wed Nov 11 13:18:07 2020 +0100
Branches: temp-modifiers-instancing
https://developer.blender.org/rB216387070f9cf3e2ce575ace9fad264b5ee133dc

support geometry output in object info node

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

M	source/blender/nodes/geometry/nodes/node_geo_object_info.cc

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
index fa22e2bfdfc..80825a66a07 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
@@ -16,6 +16,7 @@
 
 #include "node_geometry_util.hh"
 
+#include "BKE_mesh_wrapper.h"
 #include "BKE_modifier.h"
 
 static bNodeSocketTemplate geo_node_object_info_in[] = {
@@ -50,7 +51,10 @@ static void geo_object_info_exec(bNode *UNUSED(node), GeoNodeInputs inputs, GeoN
 
     if (object->type == OB_MESH) {
       Mesh *mesh = BKE_modifier_get_evaluated_mesh_from_evaluated_object(object, false);
-      geometry_set = GeometrySet::create_with_mesh(mesh, GeometryOwnershipType::ReadOnly);
+      if (mesh != nullptr) {
+        BKE_mesh_wrapper_ensure_mdata(mesh);
+        geometry_set = GeometrySet::create_with_mesh(mesh, GeometryOwnershipType::ReadOnly);
+      }
     }
   }