[Bf-blender-cvs] [5ad16e6a114] master: Cleanup: `BKE_mesh_nomain_to_mesh`: Add assert that source mesh is indeed not in Main.

Bastien Montagne noreply at git.blender.org
Fri Mar 13 17:17:34 CET 2020


Commit: 5ad16e6a114b0a22f0cbedfa57d2457c31058f95
Author: Bastien Montagne
Date:   Fri Mar 13 17:16:38 2020 +0100
Branches: master
https://developer.blender.org/rB5ad16e6a114b0a22f0cbedfa57d2457c31058f95

Cleanup: `BKE_mesh_nomain_to_mesh`: Add assert that source mesh is indeed not in Main.

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

M	source/blender/blenkernel/intern/mesh_convert.c

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

diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c
index f0bab4c0aa2..ce8fcc4eeb9 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -1420,6 +1420,8 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src,
                              const CustomData_MeshMasks *mask,
                              bool take_ownership)
 {
+  BLI_assert(mesh_src->id.tag & LIB_TAG_NO_MAIN);
+
   /* mesh_src might depend on mesh_dst, so we need to do everything with a local copy */
   /* TODO(Sybren): the above claim came from 2.7x derived-mesh code (DM_to_mesh);
    * check whether it is still true with Mesh */
@@ -1571,6 +1573,8 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src,
 
 void BKE_mesh_nomain_to_meshkey(Mesh *mesh_src, Mesh *mesh_dst, KeyBlock *kb)
 {
+  BLI_assert(mesh_src->id.tag & LIB_TAG_NO_MAIN);
+
   int a, totvert = mesh_src->totvert;
   float *fp;
   MVert *mvert;



More information about the Bf-blender-cvs mailing list