Commit: 8125271ddb29f8e42d00ee7667c24412d67fb2f5
Author: Campbell Barton
Date: Wed Oct 26 20:14:48 2016 +1100
Branches: master
https://developer.blender.org/rB8125271ddb29f8e42d00ee7667c24412d67fb2f5
Cleanup: rename functions in BLI_bitmap_draw_2d
===================================================================
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenlib/BLI_bitmap_draw_2d.h
M source/blender/blenlib/intern/bitmap_draw_2d.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/sculpt_paint/paint_mask.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/windowmanager/intern/wm_gesture.c
===================================================================
diff --git a/source/blender/blenkernel/intern/tracking.c
b/source/blender/blenkernel/intern/tracking.c
index 29750cf..96ab869 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -998,9 +998,10 @@ static void track_mask_gpencil_layer_rasterize(int
frame_width, int frame_height
point[1] = (stroke_points[i].y -
marker->search_min[1]) * frame_height;
}
/* TODO: add an option to control whether AA is
enabled or not */
- fill_poly_v2i_n(0, 0, mask_width, mask_height,
- (const int (*)[2])mask_points,
stroke->totpoints,
- track_mask_set_pixel_cb, &data);
+ BLI_bitmap_draw_2d_poly_v2i_n(
+ 0, 0, mask_width, mask_height,
+ (const int (*)[2])mask_points,
stroke->totpoints,
+ track_mask_set_pixel_cb, &data);
MEM_freeN(mask_points);
}
stroke = stroke->next;
diff --git a/source/blender/blenlib/BLI_bitmap_draw_2d.h
b/source/blender/blenlib/BLI_bitmap_draw_2d.h
index d447c58..fe890e9 100644
--- a/source/blender/blenlib/BLI_bitmap_draw_2d.h
+++ b/source/blender/blenlib/BLI_bitmap_draw_2d.h
@@ -25,11 +25,11 @@
* \ingroup bli
*/
-void plot_line_v2v2i(
+void BLI_bitmap_draw_2d_line_v2v2i(
const int p1[2], const int p2[2],
bool (*callback)(int, int, void *), void *userData);
-void fill_poly_v2i_n(
+void BLI_bitmap_draw_2d_poly_v2i_n(
const int xmin, const int ymin, const int xmax, const int ymax,
const int polyXY[][2], const int polyCorners,
void (*callback)(int x, int x_end, int y, void *), void *userData);
diff --git a/source/blender/blenlib/intern/bitmap_draw_2d.c
b/source/blender/blenlib/intern/bitmap_draw_2d.c
index 06d2185..11072f6 100644
--- a/source/blender/blenlib/intern/bitmap_draw_2d.c
+++ b/source/blender/blenlib/intern/bitmap_draw_2d.c
@@ -40,7 +40,7 @@
/**
* Plot a line from \a p1 to \a p2 (inclusive).
*/
-void plot_line_v2v2i(
+void BLI_bitmap_draw_2d_line_v2v2i(
const int p1[2], const int p2[2],
bool (*callback)(int, int, void *), void *userData)
{
@@ -117,7 +117,7 @@ void plot_line_v2v2i(
* } while (++x != x_end);
* \endcode
*/
-void fill_poly_v2i_n(
+void BLI_bitmap_draw_2d_poly_v2i_n(
const int xmin, const int ymin, const int xmax, const int ymax,
const int verts[][2], const int nr,
void (*callback)(int x, int x_end, int y, void *), void *userData)
diff --git a/source/blender/editors/mesh/editmesh_select.c
b/source/blender/editors/mesh/editmesh_select.c
index 1004b0a..a6de1b2 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -295,7 +295,7 @@ bool EDBM_backbuf_border_mask_init(ViewContext *vc, const
int mcords[][2], short
lasso_mask_data.px = dr_mask;
lasso_mask_data.width = (xmax - xmin) + 1;
- fill_poly_v2i_n(
+ BLI_bitmap_draw_2d_poly_v2i_n(
xmin, ymin, xmax + 1, ymax + 1,
mcords, tot,
edbm_mask_lasso_px_cb, &lasso_mask_data);
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c
b/source/blender/editors/sculpt_paint/paint_mask.c
index 5471a39..a4887c5 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -440,7 +440,7 @@ static int paint_mask_gesture_lasso_exec(bContext *C,
wmOperator *op)
data.width = data.rect.xmax - data.rect.xmin;
data.px = BLI_BITMAP_NEW(data.width * (data.rect.ymax -
data.rect.ymin), __func__);
- fill_poly_v2i_n(
+ BLI_bitmap_draw_2d_poly_v2i_n(
data.rect.xmin, data.rect.ymin, data.rect.xmax,
data.rect.ymax,
mcords, mcords_tot,
mask_lasso_px_cb, &data);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c
b/source/blender/editors/space_view3d/view3d_edit.c
index 3121a8f..9e41ad6 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -5053,7 +5053,7 @@ bool ED_view3d_autodist_depth_seg(ARegion *ar, const int
mval_sta[2], const int
copy_v2_v2_int(p1, mval_sta);
copy_v2_v2_int(p2, mval_end);
- plot_line_v2v2i(p1, p2, depth_segment_cb, &data);
+ BLI_bitmap_draw_2d_line_v2v2i(p1, p2, depth_segment_cb, &data);
*depth = data.depth;
diff --git a/source/blender/windowmanager/intern/wm_gesture.c
b/source/blender/windowmanager/intern/wm_gesture.c
index 1f30aa1..4620333 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -273,7 +273,7 @@ static void draw_filled_lasso(wmWindow *win, wmGesture *gt)
unsigned char *pixel_buf = MEM_callocN(sizeof(*pixel_buf) * w *
h, __func__);
struct LassoFillData lasso_fill_data = {pixel_buf, w};
- fill_poly_v2i_n(
+ BLI_bitmap_draw_2d_poly_v2i_n(
rect.xmin, rect.ymin, rect.xmax, rect.ymax,
(const int (*)[2])moves, tot,
draw_filled_lasso_px_cb, &lasso_fill_data);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
