diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-27 08:46:52 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-27 08:46:52 +0400 |
commit | 09f29c0b70357684b270745167cc30a3134b8d98 (patch) | |
tree | 8cb909d1fa49f5f017e0a0c4d09b426a4d1bd7cb /source/blender/editors/sculpt_paint | |
parent | ea270a690387c8c65ca31610a3c8ce5f06328eac (diff) |
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_uv.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 40b04437cdf..d2cf5c3c294 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -4668,7 +4668,7 @@ static int uv_sculpt_brush_poll(bContext *C) return 0; em = BMEdit_FromObject(obedit); - ret = EDBM_texFaceCheck(em); + ret = EDBM_mtexpoly_check(em); if (ret && sima) { ARegion *ar= CTX_wm_region(C); diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 240a8feeb88..4aa56266a21 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -416,7 +416,7 @@ static void uv_sculpt_stroke_exit(bContext *C, wmOperator *op) WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), data->timer); } if (data->elementMap) { - EDBM_free_uv_element_map(data->elementMap); + EDBM_uv_element_map_free(data->elementMap); } if (data->uv) { MEM_freeN(data->uv); @@ -435,9 +435,9 @@ static void uv_sculpt_stroke_exit(bContext *C, wmOperator *op) op->customdata = NULL; } -static int get_uv_element_offset_from_face(UvElementMap *map, BMFace *efa, BMLoop *l, int island_index, int doIslands) +static int uv_element_offset_from_face_get(UvElementMap *map, BMFace *efa, BMLoop *l, int island_index, int doIslands) { - UvElement *element = ED_get_uv_element(map, efa, l); + UvElement *element = ED_uv_element_get(map, efa, l); if (!element || (doIslands && element->island != island_index)) { return -1; } @@ -501,18 +501,18 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, wmEvent if (do_island_optimization) { /* We will need island information */ if (ts->uv_flag & UV_SYNC_SELECTION) { - data->elementMap = EDBM_make_uv_element_map(em, 0, 1); + data->elementMap = EDBM_uv_element_map_create(em, 0, 1); } else { - data->elementMap = EDBM_make_uv_element_map(em, 1, 1); + data->elementMap = EDBM_uv_element_map_create(em, 1, 1); } } else { if (ts->uv_flag & UV_SYNC_SELECTION) { - data->elementMap = EDBM_make_uv_element_map(em, 0, 0); + data->elementMap = EDBM_uv_element_map_create(em, 0, 0); } else { - data->elementMap = EDBM_make_uv_element_map(em, 1, 0); + data->elementMap = EDBM_uv_element_map_create(em, 1, 0); } } @@ -531,7 +531,7 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, wmEvent Image *ima= CTX_data_edit_image(C); uv_find_nearest_vert(scene, ima, em, co, NULL, &hit); - element = ED_get_uv_element(data->elementMap, hit.efa, hit.l); + element = ED_uv_element_get(data->elementMap, hit.efa, hit.l); island_index = element->island; } @@ -597,8 +597,8 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, wmEvent counter = 0; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - int offset1, itmp1 = get_uv_element_offset_from_face(data->elementMap, efa, l, island_index, do_island_optimization); - int offset2, itmp2 = get_uv_element_offset_from_face(data->elementMap, efa, l->next, island_index, do_island_optimization); + int offset1, itmp1 = uv_element_offset_from_face_get(data->elementMap, efa, l, island_index, do_island_optimization); + int offset2, itmp2 = uv_element_offset_from_face_get(data->elementMap, efa, l->next, island_index, do_island_optimization); /* Skip edge if not found(unlikely) or not on valid island */ if (itmp1 == -1 || itmp2 == -1) |