[Bf-blender-cvs] [394bd7fe057] sculpt-dev: Sculpt-dev: Fix crash in bmesh conversion code

[Joseph Eagar]

Commit: 394bd7fe05700a30366253cdb8b809dd25632f8d
Author: Joseph Eagar
Date:   Fri May 13 23:34:28 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rB394bd7fe05700a30366253cdb8b809dd25632f8d

Sculpt-dev: Fix crash in bmesh conversion code

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

M	source/blender/bmesh/intern/bmesh_mesh_convert.cc
M	source/blender/bmesh/intern/bmesh_operator_api.h

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

diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
index c7ce47a7eed..4f712ba2159 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
@@ -407,6 +407,10 @@ void BM_mesh_bm_from_me(Object *ob,
       bm_init_idmap_cdlayers(bm);
     }
 
+    if (bm->use_toolflags) {
+      bm_alloc_toolflags_cdlayers(bm, true);
+    }
+
     return; /* Sanity check. */
   }
 
diff --git a/source/blender/bmesh/intern/bmesh_operator_api.h b/source/blender/bmesh/intern/bmesh_operator_api.h
index 35bbb7b222f..7e4e608a8a5 100644
--- a/source/blender/bmesh/intern/bmesh_operator_api.h
+++ b/source/blender/bmesh/intern/bmesh_operator_api.h
@@ -6,8 +6,8 @@
  * \ingroup bmesh
  */
 
-#include "BLI_ghash.h"
 #include "BLI_compiler_compat.h"
+#include "BLI_ghash.h"
 
 #include "DNA_meshdata_types.h"