blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release' into master

This commit is contained in:
Campbell Barton 2020-07-30 17:45:26 +10:00
parent 5893a1562f 2bc017ece1
commit 742ad5acbc
Notes: blender-bot 2023-04-14 09:18:04 +02:00 
Referenced by issue #79412, Blender failed to build due to error C4133 with MSVC on windows
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenkernel/intern/mesh_convert.c
View File

@ -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;