diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 03:20:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 03:20:48 +0400 |
commit | 04ea8c0ee87e7a110d323e92116faaff20070854 (patch) | |
tree | cd3c44364ef759bb98a961d575b5e4a6343bdd28 /source/blender/editors | |
parent | b7bf20d9504127ec7c3d52bc8a1448d4a2bdc3bf (diff) |
remove the pointer from BLI_bitmap's typedef,
hides that an arg passed is really an array which may be modified by other functions.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editface.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_lattice.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_hide.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_intern.h | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_undo.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 6 |
9 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 75de4e13707..5352b367d05 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -5174,7 +5174,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) /* 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 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) 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"); diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 6fd198d9ae6..db5635d6ea3 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -198,8 +198,8 @@ static void select_linked_tfaces_with_seams(Mesh *me, const unsigned int index, 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__); + BLI_bitmap *edge_tag = BLI_BITMAP_NEW(me->totedge, __func__); + BLI_bitmap *poly_tag = BLI_BITMAP_NEW(me->totpoly, __func__); if (index != (unsigned int)-1) { /* only put face under cursor in array */ diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 54e8d8e6599..a79b0607421 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -228,7 +228,7 @@ void LATTICE_OT_select_random(wmOperatorType *ot) /************************** Select More/Less Operator *************************/ -static bool lattice_test_bitmap_uvw(Lattice *lt, BLI_bitmap selpoints, int u, int v, int w, const bool selected) +static bool lattice_test_bitmap_uvw(Lattice *lt, BLI_bitmap *selpoints, int u, int v, int w, const bool selected) { if ((u < 0 || u >= lt->pntsu) || (v < 0 || v >= lt->pntsv) || @@ -252,7 +252,7 @@ static int lattice_select_more_less(bContext *C, const bool select) BPoint *bp; const int tot = lt->pntsu * lt->pntsv * lt->pntsw; int i, w, u, v; - BLI_bitmap selpoints; + BLI_bitmap *selpoints; lt->actbp = LT_ACTBP_NONE; diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index b1f1f73f493..b9c97c32fc9 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1671,7 +1671,7 @@ void OBJECT_OT_skin_radii_equalize(wmOperatorType *ot) static void skin_armature_bone_create(Object *skin_ob, MVert *mvert, MEdge *medge, bArmature *arm, - BLI_bitmap edges_visited, + BLI_bitmap *edges_visited, const MeshElemMap *emap, EditBone *parent_bone, int parent_v) @@ -1720,7 +1720,7 @@ static void skin_armature_bone_create(Object *skin_ob, static Object *modifier_skin_armature_create(Main *bmain, Scene *scene, Object *skin_ob) { - BLI_bitmap edges_visited; + BLI_bitmap *edges_visited; DerivedMesh *deform_dm; MVert *mvert; Mesh *me = skin_ob->data; diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index 3db0bd61f03..db6380e920f 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -154,7 +154,7 @@ static void partialvis_update_grids(Object *ob, { CCGElem **grids; CCGKey key; - BLI_bitmap *grid_hidden; + BLI_bitmap **grid_hidden; int any_visible = 0; int *grid_indices, totgrid, any_changed, i; @@ -171,7 +171,7 @@ static void partialvis_update_grids(Object *ob, for (i = 0; i < totgrid; i++) { int any_hidden = 0; int g = grid_indices[i], x, y; - BLI_bitmap gh = grid_hidden[g]; + BLI_bitmap *gh = grid_hidden[g]; if (!gh) { switch (action) { diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 3aeb2f1597b..283cd0b3ee8 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1529,7 +1529,7 @@ static void do_multires_smooth_brush(Sculpt *sd, SculptSession *ss, PBVHNode *no float *tmpgrid_mask, *tmprow_mask; int v1, v2, v3, v4; int thread_num; - BLI_bitmap *grid_hidden; + BLI_bitmap **grid_hidden; int *grid_indices, totgrid, gridsize, i, x, y; sculpt_brush_test_init(ss, &test); @@ -1554,7 +1554,7 @@ static void do_multires_smooth_brush(Sculpt *sd, SculptSession *ss, PBVHNode *no for (i = 0; i < totgrid; ++i) { int gi = grid_indices[i]; - BLI_bitmap gh = grid_hidden[gi]; + BLI_bitmap *gh = grid_hidden[gi]; data = griddata[gi]; adj = &gridadj[gi]; diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 13f97c50dc7..d904ec3bc96 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -100,14 +100,14 @@ typedef struct SculptUndoNode { /* non-multires */ int maxvert; /* to verify if totvert it still the same */ int *index; /* to restore into right location */ - BLI_bitmap vert_hidden; + BLI_bitmap *vert_hidden; /* multires */ int maxgrid; /* same for grid */ int gridsize; /* same for grid */ int totgrid; /* to restore into right location */ int *grids; /* to restore into right location */ - BLI_bitmap *grid_hidden; + BLI_bitmap **grid_hidden; /* bmesh */ struct BMLogEntry *bm_entry; diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 2cc09ea2aa9..8861777f326 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -210,10 +210,10 @@ static int sculpt_undo_restore_hidden(bContext *C, DerivedMesh *dm, } } else if (unode->maxgrid && dm->getGridData) { - BLI_bitmap *grid_hidden = dm->getGridHidden(dm); + BLI_bitmap **grid_hidden = dm->getGridHidden(dm); for (i = 0; i < unode->totgrid; i++) { - SWAP(BLI_bitmap, + SWAP(BLI_bitmap *, unode->grid_hidden[i], grid_hidden[unode->grids[i]]); @@ -531,7 +531,7 @@ static void sculpt_undo_alloc_and_store_hidden(PBVH *pbvh, SculptUndoNode *unode) { PBVHNode *node = unode->node; - BLI_bitmap *grid_hidden; + BLI_bitmap **grid_hidden; int i, *grid_indices, totgrid; grid_hidden = BKE_pbvh_grid_hidden(pbvh); @@ -539,7 +539,7 @@ static void sculpt_undo_alloc_and_store_hidden(PBVH *pbvh, BKE_pbvh_node_get_grids(pbvh, node, &grid_indices, &totgrid, NULL, NULL, NULL, NULL); - unode->grid_hidden = MEM_mapallocN(sizeof(BLI_bitmap) * totgrid, + unode->grid_hidden = MEM_mapallocN(sizeof(*unode->grid_hidden) * totgrid, "unode->grid_hidden"); for (i = 0; i < totgrid; i++) { diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 767d4aca3a8..16423c60cac 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -77,7 +77,7 @@ /* user data structures for derived mesh callbacks */ typedef struct drawMeshFaceSelect_userData { Mesh *me; - BLI_bitmap edge_flags; /* pairs of edge options (visible, select) */ + BLI_bitmap *edge_flags; /* pairs of edge options (visible, select) */ } drawMeshFaceSelect_userData; typedef struct drawEMTFMapped_userData { @@ -100,9 +100,9 @@ typedef struct drawTFace_userData { BLI_INLINE int edge_vis_index(const int index) { return index * 2; } BLI_INLINE int edge_sel_index(const int index) { return index * 2 + 1; } -static BLI_bitmap get_tface_mesh_marked_edge_info(Mesh *me) +static BLI_bitmap *get_tface_mesh_marked_edge_info(Mesh *me) { - BLI_bitmap bitmap_edge_flags = BLI_BITMAP_NEW(me->totedge * 2, __func__); + BLI_bitmap *bitmap_edge_flags = BLI_BITMAP_NEW(me->totedge * 2, __func__); MPoly *mp; MLoop *ml; int i, j; |