diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 22:06:58 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 22:06:58 +0300 |
| commit | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (patch) | |
| tree | 968418721b08baacd47bab95877bc08812f3046a /source/blender/blenkernel/BKE_curve.h | |
| parent | 7759782ee7c4e654641c9f7abb51631c86e3f29c (diff) | |
| parent | a3c5de3e3ca82d8ad5a28029f3ee9207929318a1 (diff) | |
Merge branch 'master' into UI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
Diffstat (limited to 'source/blender/blenkernel/BKE_curve.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_curve.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index 9bae2ad948d..a03dd287146 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -94,10 +94,11 @@ void BKE_curve_material_remap(struct Curve *cu, const unsigned int *remap, unsig ListBase *BKE_curve_nurbs_get(struct Curve *cu); -void BKE_curve_nurb_active_set(struct Curve *cu, struct Nurb *nu); +int BKE_curve_nurb_vert_index_get(const struct Nurb *nu, const void *vert); +void BKE_curve_nurb_active_set(struct Curve *cu, const struct Nurb *nu); struct Nurb *BKE_curve_nurb_active_get(struct Curve *cu); void *BKE_curve_vert_active_get(struct Curve *cu); -void BKE_curve_nurb_vert_active_set(struct Curve *cu, struct Nurb *nu, void *vert); +void BKE_curve_nurb_vert_active_set(struct Curve *cu, const struct Nurb *nu, const void *vert); bool BKE_curve_nurb_vert_active_get(struct Curve *cu, struct Nurb **r_nu, void **r_vert); void BKE_curve_nurb_vert_active_validate(struct Curve *cu); @@ -166,6 +167,9 @@ bool BKE_nurb_type_convert(struct Nurb *nu, const short type, const bool use_han void BKE_nurb_points_add(struct Nurb *nu, int number); void BKE_nurb_bezierPoints_add(struct Nurb *nu, int number); +int BKE_nurb_index_from_uv(struct Nurb *nu, int u, int v); +void BKE_nurb_index_to_uv(struct Nurb *nu, int index, int *r_u, int *r_v); + struct BezTriple *BKE_nurb_bezt_get_next(struct Nurb *nu, struct BezTriple *bezt); struct BezTriple *BKE_nurb_bezt_get_prev(struct Nurb *nu, struct BezTriple *bezt); struct BPoint *BKE_nurb_bpoint_get_next(struct Nurb *nu, struct BPoint *bp); @@ -174,6 +178,8 @@ struct BPoint *BKE_nurb_bpoint_get_prev(struct Nurb *nu, struct BPoint *bp); void BKE_nurb_bezt_calc_normal(struct Nurb *nu, struct BezTriple *bezt, float r_normal[3]); void BKE_nurb_bezt_calc_plane(struct Nurb *nu, struct BezTriple *bezt, float r_plane[3]); +void BKE_nurb_bpoint_calc_normal(struct Nurb *nu, struct BPoint *bp, float r_normal[3]); + void BKE_nurb_handle_calc(struct BezTriple *bezt, struct BezTriple *prev, struct BezTriple *next, const bool is_fcurve); void BKE_nurb_handle_calc_simple(struct Nurb *nu, struct BezTriple *bezt); |