diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_brush.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_curve.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_gpencil.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/gpencil.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 864d7d06438..91743bfa567 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -77,7 +77,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 ff2b1a78a6f..12e3492368b 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -156,7 +156,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/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index 14c4e8fec32..3b8df66668a 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -153,7 +153,7 @@ bool BKE_gpencil_stroke_select_check( const struct bGPDstroke *gps); struct BoundBox *BKE_gpencil_boundbox_get(struct Object *ob); -void BKE_gpencil_centroid_3D(struct bGPdata *gpd, float r_centroid[3]); +void BKE_gpencil_centroid_3d(struct bGPdata *gpd, float r_centroid[3]); /* vertex groups */ void BKE_gpencil_dvert_ensure(struct bGPDstroke *gps); diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 62c72a4fa58..39266eed6fe 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -845,7 +845,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 6a3f8472abd..2f960a3a349 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -277,7 +277,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) @@ -549,7 +549,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/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index ed551b1c109..9c398182bb6 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -1147,7 +1147,7 @@ bool BKE_gpencil_stroke_select_check( } /* compute center of bounding box */ -void BKE_gpencil_centroid_3D(bGPdata *gpd, float r_centroid[3]) +void BKE_gpencil_centroid_3d(bGPdata *gpd, float r_centroid[3]) { float min[3], max[3], tot[3]; |