Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T52852: Assert in looptri calculation after recent changes.

Browse Source 
Wrong condition in asserts...
This commit is contained in:
Bastien Montagne
2017-09-20 20:45:51 +02:00
parent c5491ba874
commit 25f28d348f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@@ -1919,7 +1919,7 @@ void CDDM_recalc_looptri(DerivedMesh *dm)
const unsigned int totloop = dm->numLoopData;
DM_ensure_looptri_data(dm);
BLI_assert(cddm->dm.looptris.array_wip != NULL);
BLI_assert(totpoly == 0 || cddm->dm.looptris.array_wip != NULL);
BKE_mesh_recalc_looptri(
cddm->mloop, cddm->mpoly,

2
source/blender/blenkernel/intern/editderivedmesh.c
View File

@@ -643,7 +643,7 @@ static void emDM_recalcLoopTri(DerivedMesh *dm)
DM_ensure_looptri_data(dm);
mlooptri = dm->looptris.array_wip;
BLI_assert(mlooptri != NULL);
BLI_assert(tottri == 0 || mlooptri != NULL);
BLI_assert(poly_to_tri_count(dm->numPolyData, dm->numLoopData) == dm->looptris.num);
BLI_assert(tottri == dm->looptris.num);

2
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@@ -4484,7 +4484,7 @@ static void ccgDM_recalcLoopTri(DerivedMesh *dm)
DM_ensure_looptri_data(dm);
mlooptri = dm->looptris.array_wip;
BLI_assert(mlooptri != NULL);
BLI_assert(tottri == 0 || mlooptri != NULL);
BLI_assert(poly_to_tri_count(dm->numPolyData, dm->numLoopData) == dm->looptris.num);
BLI_assert(tottri == dm->looptris.num);