Commit: 6213d88c851d8a120b74056a6cc90a95d0cccddd
Author: Campbell Barton
Date: Thu Feb 6 01:07:18 2014 +1100
https://developer.blender.org/rB6213d88c851d8a120b74056a6cc90a95d0cccddd
Scanfill: avoid converting int<>intptr_t for displist indices
===================================================================
M source/blender/blenkernel/intern/displist.c
M source/blender/blenlib/BLI_scanfill.h
===================================================================
diff --git a/source/blender/blenkernel/intern/displist.c
b/source/blender/blenkernel/intern/displist.c
index e2c87e0..ee2c42d 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;
}
}
diff --git a/source/blender/blenlib/BLI_scanfill.h
b/source/blender/blenlib/BLI_scanfill.h
index 4639ddb..8e5445b 100644
--- a/source/blender/blenlib/BLI_scanfill.h
+++ b/source/blender/blenlib/BLI_scanfill.h
@@ -61,7 +61,7 @@ typedef struct ScanFillVert {
union {
struct ScanFillVert *v;
void *p;
- intptr_t l;
+ int i;
unsigned int u;
} tmp;
float co[3]; /* vertex location */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
