diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-09-20 21:45:51 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-09-20 21:46:51 +0300 |
| commit | 25f28d348fe1322da97c003c79d2d0e6e4267d1d (patch) | |
| tree | 31740799ef77d5de684cc81d9fe0ad1118ebb076 /source | |
| parent | c5491ba8740258167a2757b651d6d8449cfaacfc (diff) | |
Fix T52852: Assert in looptri calculation after recent changes.
Wrong condition in asserts...
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 47e1f0beb31..42ca4359a58 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -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, diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index ae4d567edf4..9f688432988 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -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); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index ee1f5dc6696..27bbdf228d4 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -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); |