diff options
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 23 | ||||
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 11 |
2 files changed, 18 insertions, 16 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index bbe5fd9765e..d5a87058ecb 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1142,7 +1142,7 @@ int BKE_mesh_nurbs_displist_to_mdata( MLoopUV *mloopuv = NULL; MEdge *medge; const float *data; - int a, b, ofs, vertcount, startvert, totvert = 0, totedge = 0, totloop = 0, totvlak = 0; + int a, b, ofs, vertcount, startvert, totvert = 0, totedge = 0, totloop = 0, totpoly = 0; int p1, p2, p3, p4, *index; const bool conv_polys = ((CU_DO_2DFILL(cu) == false) || /* 2d polys are filled with DL_INDEX3 displists */ (ob->type == OB_SURF)); /* surf polys are never filled */ @@ -1164,14 +1164,14 @@ int BKE_mesh_nurbs_displist_to_mdata( 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)); - totvlak += tot; + totpoly += tot; totloop += tot * 4; } else if (dl->type == DL_INDEX3) { int tot; totvert += dl->nr; tot = dl->parts; - totvlak += tot; + totpoly += tot; totloop += tot * 3; } dl = dl->next; @@ -1185,11 +1185,11 @@ int BKE_mesh_nurbs_displist_to_mdata( *r_allvert = mvert = MEM_calloc_arrayN(totvert, sizeof(MVert), "nurbs_init mvert"); *r_alledge = medge = MEM_calloc_arrayN(totedge, sizeof(MEdge), "nurbs_init medge"); - *r_allloop = mloop = MEM_calloc_arrayN(totvlak, 4 * sizeof(MLoop), "nurbs_init mloop"); // totloop - *r_allpoly = mpoly = MEM_calloc_arrayN(totvlak, sizeof(MPoly), "nurbs_init mloop"); + *r_allloop = mloop = MEM_calloc_arrayN(totpoly, 4 * sizeof(MLoop), "nurbs_init mloop"); // totloop + *r_allpoly = mpoly = MEM_calloc_arrayN(totpoly, sizeof(MPoly), "nurbs_init mloop"); if (r_alluv) - *r_alluv = mloopuv = MEM_calloc_arrayN(totvlak, 4 * sizeof(MLoopUV), "nurbs_init mloopuv"); + *r_alluv = mloopuv = MEM_calloc_arrayN(totpoly, 4 * sizeof(MLoopUV), "nurbs_init mloopuv"); /* verts and faces */ vertcount = 0; @@ -1368,13 +1368,14 @@ int BKE_mesh_nurbs_displist_to_mdata( dl = dl->next; } - - if (totvlak) { - make_edges_mdata_extend(r_alledge, &totedge, - *r_allpoly, *r_allloop, totvlak); + + if (totpoly) { + make_edges_mdata_extend( + r_alledge, &totedge, + *r_allpoly, *r_allloop, totpoly); } - *r_totpoly = totvlak; + *r_totpoly = totpoly; *r_totloop = totloop; *r_totedge = totedge; *r_totvert = totvert; diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index a2c1e4d9463..c1f8341ddc6 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -573,9 +573,10 @@ static int convert_include(const char *filename) /* read include file, skip structs with a '#' before it. * store all data in temporal arrays. */ - int filelen, count, overslaan, slen, type, name, strct; + int filelen, count, slen, type, name, strct; short *structpoin, *sp; char *maindata, *mainend, *md, *md1; + bool skip_struct; md = maindata = read_file_data(filename, &filelen); if (filelen == -1) { @@ -588,18 +589,18 @@ static int convert_include(const char *filename) /* we look for '{' and then back to 'struct' */ count = 0; - overslaan = 0; + skip_struct = false; while (count < filelen) { /* code for skipping a struct: two hashes on 2 lines. (preprocess added a space) */ if (md[0] == '#' && md[1] == ' ' && md[2] == '#') { - overslaan = 1; + skip_struct = true; } if (md[0] == '{') { md[0] = 0; - if (overslaan) { - overslaan = 0; + if (skip_struct) { + skip_struct = false; } else { if (md[-1] == ' ') md[-1] = 0; |