blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Sculpt dyntopo: fix msvc compiler error

This commit is contained in:
Joseph Eagar 2021-07-12 16:01:17 -04:00
parent 4e797dbc69
commit d529e13d65
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/BLI_mempool.h
View File

@ -98,12 +98,12 @@ in chunks of size pchunk, and returned in r_chunks.
*/
BLI_mempool *BLI_mempool_create_for_tasks(const unsigned int esize,
unsigned int totelem,
const unsigned int pchunk,
int totelem,
const int pchunk,
void ***r_chunks,
unsigned int *r_totchunk,
unsigned int *r_esize,
unsigned int flag);
int *r_totchunk,
int *r_esize,
int flag);
#ifdef __cplusplus
}

10
source/blender/blenlib/intern/BLI_mempool.c
View File

@ -281,12 +281,12 @@ to tasks.
*/
BLI_mempool *BLI_mempool_create_for_tasks(const unsigned int esize,
unsigned int totelem,
const unsigned int pchunk,
int totelem,
const int pchunk,
void ***r_chunks,
unsigned int *r_totchunk,
unsigned int *r_esize,
unsigned int flag)
int *r_totchunk,
int *r_esize,
int flag)
{
BLI_mempool *pool = BLI_mempool_create(esize, 0, pchunk, flag);

40
source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c
View File

@ -341,33 +341,33 @@ BMesh *BM_mesh_bm_from_me_threaded(BMesh *bm,
int vsize, esize, lsize, fsize;
bm->vpool = BLI_mempool_create_for_tasks(sizeof(BMVert),
(uint)bm->totvert,
(uint)VCHUNK,
bm->totvert,
VCHUNK,
(void ***)&verts,
(uint)&totcv,
(uint)&vsize,
(uint)BLI_MEMPOOL_ALLOW_ITER);
&totcv,
&vsize,
BLI_MEMPOOL_ALLOW_ITER);
bm->epool = BLI_mempool_create_for_tasks(sizeof(BMEdge),
(uint)bm->totedge,
(uint)ECHUNK,
bm->totedge,
ECHUNK,
(void ***)&edges,
(uint)&totce,
(uint)&esize,
(uint)BLI_MEMPOOL_ALLOW_ITER);
&totce,
&esize,
BLI_MEMPOOL_ALLOW_ITER);
bm->lpool = BLI_mempool_create_for_tasks(sizeof(BMLoop),
(uint)bm->totloop,
(uint)LCHUNK,
bm->totloop,
LCHUNK,
(void ***)&loops,
(uint)&totcl,
(uint)&lsize,
(uint)BLI_MEMPOOL_ALLOW_ITER);
&totcl,
&lsize,
BLI_MEMPOOL_ALLOW_ITER);
bm->fpool = BLI_mempool_create_for_tasks(sizeof(BMFace),
(uint)bm->totface,
(uint)FCHUNK,
bm->totface,
FCHUNK,
(void ***)&faces,
(uint)&totcf,
(uint)&fsize,
(uint)BLI_MEMPOOL_ALLOW_ITER);
&totcf,
&fsize,
BLI_MEMPOOL_ALLOW_ITER);
data.verts = verts;
data.edges = edges;