From fe566a30f3c7ae835c1f2750fb773073b8e40622 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 13 Nov 2018 14:21:42 +1100 Subject: Cleanup: use lowercase 2d/3d in function names --- source/blender/blenkernel/BKE_brush.h | 2 +- source/blender/blenkernel/BKE_curve.h | 2 +- source/blender/blenkernel/intern/brush.c | 2 +- source/blender/blenkernel/intern/curve.c | 4 ++-- source/blender/editors/curve/editcurve.c | 4 ++-- source/blender/editors/curve/editcurve_add.c | 2 +- source/blender/editors/sculpt_paint/paint_image_2d.c | 4 ++-- source/blender/editors/sculpt_paint/paint_image_proj.c | 2 +- source/blender/editors/sculpt_paint/paint_vertex.c | 4 ++-- source/blender/editors/sculpt_paint/sculpt.c | 4 ++-- source/blender/editors/space_view3d/view3d_buttons.c | 2 +- source/blender/editors/transform/transform_generics.c | 2 +- source/blender/editors/util/ed_transverts.c | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index eda1c51bbc2..9fc399c428f 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -69,7 +69,7 @@ float BKE_brush_curve_strength_clamped(struct Brush *br, float p, const float le float BKE_brush_curve_strength(const struct Brush *br, float p, const float len); /* sampling */ -float BKE_brush_sample_tex_3D( +float BKE_brush_sample_tex_3d( const struct Scene *scene, const struct Brush *br, const float point[3], float rgba[4], const int thread, struct ImagePool *pool); float BKE_brush_sample_masktex( diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index 08cff0c369d..5b7e5f9eebb 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -154,7 +154,7 @@ void BKE_nurb_free(struct Nurb *nu); struct Nurb *BKE_nurb_duplicate(const struct Nurb *nu); struct Nurb *BKE_nurb_copy(struct Nurb *src, int pntsu, int pntsv); -void BKE_nurb_test2D(struct Nurb *nu); +void BKE_nurb_test_2d(struct Nurb *nu); void BKE_nurb_minmax(struct Nurb *nu, bool use_radius, float min[3], float max[3]); float BKE_nurb_calc_length(const struct Nurb *nu, int resolution); diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 50e0d158ce0..5b76d75f261 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -461,7 +461,7 @@ void BKE_brush_curve_preset(Brush *b, eCurveMappingPreset preset) * region space mouse coordinates, or 3d world coordinates for 3D mapping. * * rgba outputs straight alpha. */ -float BKE_brush_sample_tex_3D(const Scene *scene, const Brush *br, +float BKE_brush_sample_tex_3d(const Scene *scene, const Brush *br, const float point[3], float rgba[4], const int thread, struct ImagePool *pool) diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index ea3c6c485ec..b395df49061 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -275,7 +275,7 @@ void BKE_curve_curve_dimension_update(Curve *cu) else { for (; nu; nu = nu->next) { nu->flag |= CU_2D; - BKE_nurb_test2D(nu); + BKE_nurb_test_2d(nu); /* since the handles are moved they need to be auto-located again */ if (nu->type == CU_BEZIER) @@ -547,7 +547,7 @@ void BKE_nurbList_duplicate(ListBase *lb1, const ListBase *lb2) } } -void BKE_nurb_test2D(Nurb *nu) +void BKE_nurb_test_2d(Nurb *nu) { BezTriple *bezt; BPoint *bp; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index b046e1b6ae7..342eef063f4 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1248,7 +1248,7 @@ void ED_curve_editnurb_make(Object *obedit) nu = cu->nurb.first; while (nu) { newnu = BKE_nurb_duplicate(nu); - BKE_nurb_test2D(newnu); // after join, or any other creation of curve + BKE_nurb_test_2d(newnu); // after join, or any other creation of curve BLI_addtail(&editnurb->nurbs, newnu); nu = nu->next; } @@ -1552,7 +1552,7 @@ void ed_editnurb_translate_flag(ListBase *editnurb, short flag, const float vec[ } } - BKE_nurb_test2D(nu); + BKE_nurb_test_2d(nu); } } diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c index a91b58f1e65..a6100d9bb14 100644 --- a/source/blender/editors/curve/editcurve_add.c +++ b/source/blender/editors/curve/editcurve_add.c @@ -464,7 +464,7 @@ Nurb *ED_curve_add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], cu->actnu = BLI_listbase_count(editnurb); cu->actvert = CU_ACT_NONE; - BKE_nurb_test2D(nu); + BKE_nurb_test_2d(nu); } return nu; diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index d89d4f72d3d..c5bd88d8047 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -409,7 +409,7 @@ static ImBuf *brush_painter_imbuf_new(BrushPainter *painter, int size, float pre if (is_texbrush) { brush_imbuf_tex_co(&tex_mapping, x, y, texco); - BKE_brush_sample_tex_3D(scene, brush, texco, rgba, thread, pool); + BKE_brush_sample_tex_3d(scene, brush, texco, rgba, thread, pool); /* TODO(sergey): Support texture paint color space. */ if (!use_float) { IMB_colormanagement_scene_linear_to_display_v3(rgba, display); @@ -484,7 +484,7 @@ static void brush_painter_imbuf_update( if (!use_texture_old) { if (is_texbrush) { brush_imbuf_tex_co(&tex_mapping, x, y, texco); - BKE_brush_sample_tex_3D(scene, brush, texco, rgba, thread, pool); + BKE_brush_sample_tex_3d(scene, brush, texco, rgba, thread, pool); /* TODO(sergey): Support texture paint color space. */ if (!use_float) { IMB_colormanagement_scene_linear_to_display_v3(rgba, display); diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 81a44317735..bfde868c241 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4758,7 +4758,7 @@ static void *do_projectpaint_thread(void *ph_v) } /* note, for clone and smear, we only use the alpha, could be a special function */ - BKE_brush_sample_tex_3D(ps->scene, brush, samplecos, texrgba, thread_index, pool); + BKE_brush_sample_tex_3d(ps->scene, brush, samplecos, texrgba, thread_index, pool); copy_v3_v3(texrgb, texrgba); mask *= texrgba[3]; diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index a98a246363a..d35ab590620 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -317,7 +317,7 @@ static void tex_color_alpha( const Brush *brush = BKE_paint_brush(&vp->paint); BLI_assert(brush->mtex.tex != NULL); if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_3D) { - BKE_brush_sample_tex_3D(vc->scene, brush, co, r_rgba, 0, NULL); + BKE_brush_sample_tex_3d(vc->scene, brush, co, r_rgba, 0, NULL); } else { float co_ss[2]; /* screenspace */ @@ -327,7 +327,7 @@ static void tex_color_alpha( V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_NEAR) == V3D_PROJ_RET_OK) { const float co_ss_3d[3] = {co_ss[0], co_ss[1], 0.0f}; /* we need a 3rd empty value */ - BKE_brush_sample_tex_3D(vc->scene, brush, co_ss_3d, r_rgba, 0, NULL); + BKE_brush_sample_tex_3d(vc->scene, brush, co_ss_3d, r_rgba, 0, NULL); } else { zero_v4(r_rgba); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 3895b8ed44b..3149f58a880 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1212,7 +1212,7 @@ float tex_strength(SculptSession *ss, const Brush *br, else if (mtex->brush_map_mode == MTEX_MAP_MODE_3D) { /* Get strength by feeding the vertex * location directly into a texture */ - avg = BKE_brush_sample_tex_3D(scene, br, point, rgba, 0, ss->tex_pool); + avg = BKE_brush_sample_tex_3d(scene, br, point, rgba, 0, ss->tex_pool); } else if (ss->texcache) { float symm_point[3], point_2d[2]; @@ -1253,7 +1253,7 @@ float tex_strength(SculptSession *ss, const Brush *br, } else { const float point_3d[3] = {point_2d[0], point_2d[1], 0.0f}; - avg = BKE_brush_sample_tex_3D(scene, br, point_3d, rgba, 0, ss->tex_pool); + avg = BKE_brush_sample_tex_3d(scene, br, point_3d, rgba, 0, ss->tex_pool); } } diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 63786e87b1f..05e9a34f492 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -716,7 +716,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } } - BKE_nurb_test2D(nu); + BKE_nurb_test_2d(nu); BKE_nurb_handles_test(nu, true); /* test for bezier too */ nu = nu->next; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index fa3bf6c81e2..2dc8bf66225 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -760,7 +760,7 @@ static void recalcData_objects(TransInfo *t) else { /* Normal updating */ while (nu) { - BKE_nurb_test2D(nu); + BKE_nurb_test_2d(nu); BKE_nurb_handles_calc(nu); nu = nu->next; } diff --git a/source/blender/editors/util/ed_transverts.c b/source/blender/editors/util/ed_transverts.c index e6b13569d6a..09f1c060641 100644 --- a/source/blender/editors/util/ed_transverts.c +++ b/source/blender/editors/util/ed_transverts.c @@ -112,7 +112,7 @@ void ED_transverts_update_obedit(TransVertStore *tvs, Object *obedit) } } - BKE_nurb_test2D(nu); + BKE_nurb_test_2d(nu); BKE_nurb_handles_test(nu, true); /* test for bezier too */ nu = nu->next; } -- cgit v1.2.3