diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-05 18:07:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-05 18:07:18 +0400 |
| commit | 6213d88c851d8a120b74056a6cc90a95d0cccddd (patch) | |
| tree | ebe961aa2da9f0c78c1c91f3cb140272dd671309 /source/blender/blenkernel/intern/displist.c | |
| parent | 41d23116aa4ed36aec8b480ce2fc207d72ad88ce (diff) | |
Scanfill: avoid converting int<>intptr_t for displist indices
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index e2c87e08b54..ee2c42d33cd 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -458,7 +458,7 @@ void BKE_displist_fill(ListBase *dispbase, ListBase *to, const float normal_proj DispList *dlnew = NULL, *dl; float *f1; int colnr = 0, charidx = 0, cont = 1, tot, a, *index, nextcol = 0; - intptr_t totvert; + int totvert; if (dispbase == NULL) return; @@ -541,23 +541,22 @@ void BKE_displist_fill(ListBase *dispbase, ListBase *to, const float normal_proj f1 += 3; /* index number */ - sf_vert->tmp.l = totvert; + sf_vert->tmp.i = totvert; totvert++; } /* index data */ - sf_tri = sf_ctx.fillfacebase.first; + index = dlnew->index; - while (sf_tri) { - index[0] = (intptr_t)sf_tri->v1->tmp.l; - index[1] = (intptr_t)sf_tri->v2->tmp.l; - index[2] = (intptr_t)sf_tri->v3->tmp.l; + for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next) { + index[0] = sf_tri->v1->tmp.i; + index[1] = sf_tri->v2->tmp.i; + index[2] = sf_tri->v3->tmp.i; if (flipnormal) SWAP(int, index[0], index[2]); index += 3; - sf_tri = sf_tri->next; } } |