[Bf-blender-cvs] [5f1fe265afe] refactor-mesh-hide-generic: Add back assert, reorder

Hans Goudey noreply at git.blender.org
Thu Aug 11 18:38:11 CEST 2022


Commit: 5f1fe265afee3aa07f75b64ce658774b6bccae22
Author: Hans Goudey
Date:   Thu Aug 11 12:38:02 2022 -0400
Branches: refactor-mesh-hide-generic
https://developer.blender.org/rB5f1fe265afee3aa07f75b64ce658774b6bccae22

Add back assert, reorder

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

M	source/blender/modifiers/intern/MOD_decimate.c

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

diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 3d0a518a742..55d9d148d10 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -201,9 +201,11 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
 
   updateFaceCount(ctx, dmd, bm->totface);
 
-  result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh);
   /* make sure we never alloc'd these */
   BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && bm->ftoolflagpool == NULL);
+  BLI_assert(bm->vtable == NULL && bm->etable == NULL && bm->ftable == NULL);
+
+  result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh);
 
   BM_mesh_free(bm);



More information about the Bf-blender-cvs mailing list