[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58518] trunk/blender/source/blender: remove the pointer from BLI_bitmap's typedef,
Campbell Barton
ideasman42 at gmail.com
Tue Jul 23 01:20:48 CEST 2013
Revision: 58518
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58518
Author: campbellbarton
Date: 2013-07-22 23:20:48 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
remove the pointer from BLI_bitmap's typedef,
hides that an arg passed is really an array which may be modified by other functions.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_pbvh.h
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/pbvh.c
trunk/blender/source/blender/blenkernel/intern/pbvh_intern.h
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenlib/BLI_bitmap.h
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
Modified: trunk/blender/source/blender/blenkernel/BKE_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pbvh.h 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/blenkernel/BKE_pbvh.h 2013-07-22 23:20:48 UTC (rev 58518)
@@ -223,7 +223,7 @@
struct CCGElem **grids;
struct CCGElem *grid;
struct CCGKey *key;
- BLI_bitmap *grid_hidden, gh;
+ BLI_bitmap **grid_hidden, *gh;
int *grid_indices;
int totgrid;
int gridsize;
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2013-07-22 23:20:48 UTC (rev 58518)
@@ -2190,7 +2190,7 @@
struct CageUserData {
int totvert;
float (*cos_cage)[3];
- BLI_bitmap visit_bitmap;
+ BLI_bitmap *visit_bitmap;
};
static void cage_mapped_verts_callback(void *userData, int index, const float co[3],
@@ -2207,7 +2207,7 @@
float (*BKE_editmesh_vertexCos_get(BMEditMesh *em, Scene *scene, int *r_numVerts))[3]
{
DerivedMesh *cage, *final;
- BLI_bitmap visit_bitmap;
+ BLI_bitmap *visit_bitmap;
struct CageUserData data;
float (*cos_cage)[3];
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2013-07-22 23:20:48 UTC (rev 58518)
@@ -105,15 +105,15 @@
}
/** Grid hiding **/
-static BLI_bitmap multires_mdisps_upsample_hidden(BLI_bitmap lo_hidden,
- int lo_level,
- int hi_level,
+static BLI_bitmap *multires_mdisps_upsample_hidden(BLI_bitmap *lo_hidden,
+ int lo_level,
+ int hi_level,
- /* assumed to be at hi_level (or
- * null) */
- BLI_bitmap prev_hidden)
+ /* assumed to be at hi_level (or
+ * null) */
+ BLI_bitmap *prev_hidden)
{
- BLI_bitmap subd;
+ BLI_bitmap *subd;
int hi_gridsize = ccg_gridsize(hi_level);
int lo_gridsize = ccg_gridsize(lo_level);
int yh, xh, xl, yl, xo, yo, hi_ndx;
@@ -168,11 +168,11 @@
return subd;
}
-static BLI_bitmap multires_mdisps_downsample_hidden(BLI_bitmap old_hidden,
- int old_level,
- int new_level)
+static BLI_bitmap *multires_mdisps_downsample_hidden(BLI_bitmap *old_hidden,
+ int old_level,
+ int new_level)
{
- BLI_bitmap new_hidden;
+ BLI_bitmap *new_hidden;
int new_gridsize = ccg_gridsize(new_level);
int old_gridsize = ccg_gridsize(old_level);
int x, y, factor, old_value;
@@ -200,7 +200,7 @@
Mesh *me, int level)
{
const MDisps *mdisps = CustomData_get_layer(&me->ldata, CD_MDISPS);
- BLI_bitmap *grid_hidden = ccgdm->gridHidden;
+ BLI_bitmap **grid_hidden = ccgdm->gridHidden;
int *gridOffset;
int i, j;
@@ -210,7 +210,7 @@
for (j = 0; j < me->mpoly[i].totloop; j++) {
int g = gridOffset[i] + j;
const MDisps *md = &mdisps[g];
- BLI_bitmap gh = md->hidden;
+ BLI_bitmap *gh = md->hidden;
if (gh) {
grid_hidden[g] =
@@ -224,7 +224,7 @@
* the current level of md.hidden) */
static void multires_mdisps_subdivide_hidden(MDisps *md, int new_level)
{
- BLI_bitmap subd;
+ BLI_bitmap *subd;
BLI_assert(md->hidden);
@@ -647,7 +647,7 @@
multires_copy_grid(ndisps, hdisps, nsize, hsize);
if (mdisp->hidden) {
- BLI_bitmap gh =
+ BLI_bitmap *gh =
multires_mdisps_downsample_hidden(mdisp->hidden,
mdisp->level,
lvl);
@@ -1251,7 +1251,7 @@
void multires_modifier_update_hidden(DerivedMesh *dm)
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
- BLI_bitmap *grid_hidden = ccgdm->gridHidden;
+ BLI_bitmap **grid_hidden = ccgdm->gridHidden;
Mesh *me = ccgdm->multires.ob->data;
MDisps *mdisps = CustomData_get_layer(&me->ldata, CD_MDISPS);
int totlvl = ccgdm->multires.totlvl;
@@ -1262,7 +1262,7 @@
for (i = 0; i < me->totloop; i++) {
MDisps *md = &mdisps[i];
- BLI_bitmap gh = grid_hidden[i];
+ BLI_bitmap *gh = grid_hidden[i];
if (!gh && md->hidden) {
MEM_freeN(md->hidden);
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh.c 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh.c 2013-07-22 23:20:48 UTC (rev 58518)
@@ -538,7 +538,7 @@
/* Do a full rebuild with on Grids data structure */
void BKE_pbvh_build_grids(PBVH *bvh, CCGElem **grids, DMGridAdjacency *gridadj,
- int totgrid, CCGKey *key, void **gridfaces, DMFlagMat *flagmats, BLI_bitmap *grid_hidden)
+ int totgrid, CCGKey *key, void **gridfaces, DMFlagMat *flagmats, BLI_bitmap **grid_hidden)
{
BBC *prim_bbc = NULL;
BB cb;
@@ -1253,7 +1253,7 @@
}
}
-BLI_bitmap *BKE_pbvh_grid_hidden(const PBVH *bvh)
+BLI_bitmap **BKE_pbvh_grid_hidden(const PBVH *bvh)
{
BLI_assert(bvh->type == PBVH_GRIDS);
return bvh->grid_hidden;
@@ -1469,7 +1469,7 @@
for (i = 0; i < totgrid; ++i) {
CCGElem *grid = bvh->grids[node->prim_indices[i]];
- BLI_bitmap gh;
+ BLI_bitmap *gh;
if (!grid)
continue;
@@ -1664,7 +1664,7 @@
}
void BKE_pbvh_grids_update(PBVH *bvh, CCGElem **grids, DMGridAdjacency *gridadj, void **gridfaces,
- DMFlagMat *flagmats, BLI_bitmap *grid_hidden)
+ DMFlagMat *flagmats, BLI_bitmap **grid_hidden)
{
int a;
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_intern.h
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_intern.h 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_intern.h 2013-07-22 23:20:48 UTC (rev 58518)
@@ -139,11 +139,11 @@
void **gridfaces;
const DMFlagMat *grid_flag_mats;
int totgrid;
- BLI_bitmap *grid_hidden;
+ BLI_bitmap **grid_hidden;
/* Only used during BVH build and update,
* don't need to remain valid after */
- BLI_bitmap vert_bitmap;
+ BLI_bitmap *vert_bitmap;
#ifdef PERFCNTRS
int perf_modified;
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-07-22 23:20:48 UTC (rev 58518)
@@ -2930,7 +2930,7 @@
gridFaces = MEM_mallocN(sizeof(CCGFace *) * numGrids, "ccgdm.gridFaces");
gridFlagMats = MEM_mallocN(sizeof(DMFlagMat) * numGrids, "ccgdm.gridFlagMats");
- ccgdm->gridHidden = MEM_callocN(sizeof(BLI_bitmap) * numGrids, "ccgdm.gridHidden");
+ ccgdm->gridHidden = MEM_callocN(sizeof(*ccgdm->gridHidden) * numGrids, "ccgdm.gridHidden");
for (gIndex = 0, index = 0; index < numFaces; index++) {
CCGFace *f = ccgdm->faceMap[index].face;
@@ -3002,7 +3002,7 @@
return ccgdm->gridFlagMats;
}
-static BLI_bitmap *ccgDM_getGridHidden(DerivedMesh *dm)
+static BLI_bitmap **ccgDM_getGridHidden(DerivedMesh *dm)
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
Modified: trunk/blender/source/blender/blenlib/BLI_bitmap.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_bitmap.h 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/blenlib/BLI_bitmap.h 2013-07-22 23:20:48 UTC (rev 58518)
@@ -26,7 +26,7 @@
#ifndef __BLI_BITMAP_H__
#define __BLI_BITMAP_H__
-typedef unsigned int *BLI_bitmap;
+typedef unsigned int BLI_bitmap;
/* warning: the bitmap does not keep track of its own size or check
* for out-of-bounds access */
@@ -48,7 +48,7 @@
/* allocate memory for a bitmap with '_tot' bits; free
* with MEM_freeN() */
#define BLI_BITMAP_NEW(_tot, _alloc_string) \
- ((BLI_bitmap)MEM_callocN(BLI_BITMAP_SIZE(_tot), \
+ ((BLI_bitmap *)MEM_callocN(BLI_BITMAP_SIZE(_tot), \
_alloc_string))
/* get the value of a single bit at '_index' */
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2013-07-22 23:20:48 UTC (rev 58518)
@@ -5174,7 +5174,7 @@
/* may not be optimal always (example: end of NURBS sphere) */
if (obedit->type == OB_SURF) {
for (nu = editnurb->first; nu; nu = nu->next) {
- BLI_bitmap selbpoints;
+ BLI_bitmap *selbpoints;
a = nu->pntsu * nu->pntsv;
bp = nu->bp;
selbpoints = BLI_BITMAP_NEW(a, "selectlist");
@@ -5260,7 +5260,7 @@
if (obedit->type == OB_SURF) {
for (nu = editnurb->first; nu; nu = nu->next) {
- BLI_bitmap selbpoints;
+ BLI_bitmap *selbpoints;
a = nu->pntsu * nu->pntsv;
bp = nu->bp;
selbpoints = BLI_BITMAP_NEW(a, "selectlist");
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2013-07-22 22:59:47 UTC (rev 58517)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2013-07-22 23:20:48 UTC (rev 58518)
@@ -198,8 +198,8 @@
bool do_it = true;
bool mark = false;
- BLI_bitmap edge_tag = BLI_BITMAP_NEW(me->totedge, __func__);
- BLI_bitmap poly_tag = BLI_BITMAP_NEW(me->totpoly, __func__);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list