[Bf-blender-cvs] [5a1ecb17029] soc-2020-io-performance: Add null check for dvert

[Ankit Meel]

Commit: 5a1ecb170293d468c410e8ddd6569fcab629b39c
Author: Ankit Meel
Date:   Thu Jul 2 00:32:12 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB5a1ecb170293d468c410e8ddd6569fcab629b39c

Add null check for dvert

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
index 7d6df6c6ed4..d6f7e108a9b 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
@@ -285,10 +285,16 @@ const char *OBJMesh::get_poly_deform_group_name(const MPoly &mpoly, short &r_las
   /* Whether at least one vertex in the polygon belongs to any group. */
   bool found_group = false;
 
-  const MDeformVert *dvert;
+  const MDeformVert *dvert_orig = (MDeformVert *)CustomData_get_layer(&_export_mesh_eval->vdata,
+                                                                      CD_MDEFORMVERT);
+  if (!dvert_orig) {
+    return nullptr;
+  }
+
   const MDeformWeight *curr_weight;
+  const MDeformVert *dvert;
   for (uint loop_index = 0; loop_index < mpoly.totloop; loop_index++) {
-    dvert = &_export_mesh_eval->dvert[(mloop + loop_index)->v];
+    dvert = &dvert_orig[(mloop + loop_index)->v];
     curr_weight = dvert->dw;
     if (curr_weight) {
       bDeformGroup *vertex_group = (bDeformGroup *)BLI_findlink(
@@ -299,6 +305,7 @@ const char *OBJMesh::get_poly_deform_group_name(const MPoly &mpoly, short &r_las
       }
     }
   }
+
   if (!found_group) {
     if (r_last_vertex_group == -1) {
       /* "off" has already been written and this face also belongs to no vertex group. */