diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-07-30 10:45:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-07-30 10:45:26 +0300 |
commit | 742ad5acbc01bf0ad7e25e37ea2e1c10e2dbc53e (patch) | |
tree | 6a6f33d3f0a629eb5ddcca9f6a9121bf33b74473 | |
parent | 5893a1562fdb48d636731425a114b58e9bd9ab72 (diff) | |
parent | 2bc017ece147bd5556ca524fb9989ab79789f30c (diff) |
Merge branch 'blender-v2.90-release' into master
-rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 9e5565d744a..a0f3bc9e74d 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -286,12 +286,14 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, } } else if (dl->type == DL_SURF) { - int tot; - totvert += dl->parts * dl->nr; - tot = (dl->parts - 1 + ((dl->flag & DL_CYCL_V) == 2)) * - (dl->nr - 1 + (dl->flag & DL_CYCL_U)); - totpoly += tot; - totloop += tot * 4; + if (dl->parts != 0) { + int tot; + totvert += dl->parts * dl->nr; + tot = (((dl->flag & DL_CYCL_U) ? 1 : 0) + (dl->nr - 1)) * + (((dl->flag & DL_CYCL_V) ? 1 : 0) + (dl->parts - 1)); + totpoly += tot; + totloop += tot * 4; + } } else if (dl->type == DL_INDEX3) { int tot; |