diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-31 17:32:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-31 18:30:39 +0300 |
commit | d4fde32b122f29ce79cb9de5757caab580e7babd (patch) | |
tree | aa2d0968474630c79b3eb42dd7bc98c715d4ec74 /source/blender/editors/uvedit | |
parent | 23e14259d2485fe58c89ef34eeb2df6c1d8328dc (diff) |
Cleanup: naming
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_draw.c | 6 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_unwrap_ops.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 83fd7e6505d..a6e83ce0311 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -71,7 +71,7 @@ static void draw_uvs_lineloop_bmface(BMFace *efa, const int cd_loop_uv_offset); -void draw_image_cursor(ARegion *ar, const float cursor[2]) +void ED_image_draw_cursor(ARegion *ar, const float cursor[2]) { float zoom[2], x_fac, y_fac; @@ -963,7 +963,7 @@ static void draw_uv_shadows_get(SpaceImage *sima, Object *ob, Object *obedit, bo *show_texpaint = (ob && ob->type == OB_MESH && ob->mode == OB_MODE_TEXTURE_PAINT); } -void draw_uvedit_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *obedit, Object *obact) +void ED_uvedit_draw_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *obedit, Object *obact) { ToolSettings *toolsettings = scene->toolsettings; bool show_uvedit, show_uvshadow, show_texpaint_uvshadow; @@ -980,7 +980,7 @@ void draw_uvedit_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *obedi draw_uvs_texpaint(sima, scene, obact); if (show_uvedit && !(toolsettings->use_uv_sculpt)) - draw_image_cursor(ar, sima->cursor); + ED_image_draw_cursor(ar, sima->cursor); } } diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index bc08782e54b..6a33351753e 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -1601,7 +1601,7 @@ void UV_OT_cylinder_project(wmOperatorType *ot) /******************* Cube Project operator ****************/ -void ED_uvedit_cube_project_unwrap(Object *ob, BMesh *bm, float cube_size, bool use_select) +void ED_uvedit_unwrap_cube_project(Object *ob, BMesh *bm, float cube_size, bool use_select) { BMFace *efa; BMLoop *l; @@ -1662,8 +1662,7 @@ static int cube_project_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - ED_uvedit_cube_project_unwrap(obedit, em->bm, cube_size, true); - + ED_uvedit_unwrap_cube_project(obedit, em->bm, cube_size, true); uv_map_clip_correct(scene, obedit, em, op); DAG_id_tag_update(obedit->data, 0); |