diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-06-29 13:49:30 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-06-29 16:47:38 +0300 |
commit | 399dbb1aa391f04357f91ab875241db3c6041aa5 (patch) | |
tree | bcd39c2b1f90764b3064d3b25fc7c1e496cc9bdb /source/blender/editors/gpencil/gpencil_intern.h | |
parent | 1cda37490690c259c716160dcb77ea43dccd5a03 (diff) |
GPencil: Cleanup - Rename some functions from gp_ to gpencil_
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_intern.h')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_intern.h | 102 |
1 files changed, 52 insertions, 50 deletions
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index bc46842bb3b..bd697dbc768 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -248,7 +248,7 @@ typedef struct tGPDprimitive { } tGPDprimitive; /* Modal Operator Drawing Callbacks ------------------------ */ -void ED_gp_draw_fill(struct tGPDdraw *tgpw); +void ED_gpencil_draw_fill(struct tGPDdraw *tgpw); /* ***************************************************** */ /* Internal API */ @@ -272,83 +272,85 @@ typedef struct GP_SpaceConversion { float mat[4][4]; /* transform matrix on the strokes (introduced in [b770964]) */ } GP_SpaceConversion; -bool gp_stroke_inside_circle(const float mval[2], int rad, int x0, int y0, int x1, int y1); +bool gpencil_stroke_inside_circle(const float mval[2], int rad, int x0, int y0, int x1, int y1); -void gp_point_conversion_init(struct bContext *C, GP_SpaceConversion *r_gsc); +void gpencil_point_conversion_init(struct bContext *C, GP_SpaceConversion *r_gsc); -void gp_point_to_xy(const GP_SpaceConversion *gsc, - const struct bGPDstroke *gps, - const struct bGPDspoint *pt, - int *r_x, - int *r_y); +void gpencil_point_to_xy(const GP_SpaceConversion *gsc, + const struct bGPDstroke *gps, + const struct bGPDspoint *pt, + int *r_x, + int *r_y); -void gp_point_to_xy_fl(const GP_SpaceConversion *gsc, - const bGPDstroke *gps, - const bGPDspoint *pt, - float *r_x, - float *r_y); +void gpencil_point_to_xy_fl(const GP_SpaceConversion *gsc, + const bGPDstroke *gps, + const bGPDspoint *pt, + float *r_x, + float *r_y); -void gp_point_to_parent_space(const bGPDspoint *pt, const float diff_mat[4][4], bGPDspoint *r_pt); +void gpencil_point_to_parent_space(const bGPDspoint *pt, + const float diff_mat[4][4], + bGPDspoint *r_pt); /** * Change points position relative to parent object */ -void gp_apply_parent(struct Depsgraph *depsgraph, - struct Object *obact, - bGPDlayer *gpl, - bGPDstroke *gps); +void gpencil_apply_parent(struct Depsgraph *depsgraph, + struct Object *obact, + bGPDlayer *gpl, + bGPDstroke *gps); /** * Change point position relative to parent object */ -void gp_apply_parent_point(struct Depsgraph *depsgraph, - struct Object *obact, - bGPDlayer *gpl, - bGPDspoint *pt); +void gpencil_apply_parent_point(struct Depsgraph *depsgraph, + struct Object *obact, + bGPDlayer *gpl, + bGPDspoint *pt); -void gp_point_3d_to_xy(const GP_SpaceConversion *gsc, - const short flag, - const float pt[3], - float xy[2]); +void gpencil_point_3d_to_xy(const GP_SpaceConversion *gsc, + const short flag, + const float pt[3], + float xy[2]); -bool gp_point_xy_to_3d(const GP_SpaceConversion *gsc, - struct Scene *scene, - const float screen_co[2], - float r_out[3]); +bool gpencil_point_xy_to_3d(const GP_SpaceConversion *gsc, + struct Scene *scene, + const float screen_co[2], + float r_out[3]); /* helper to convert 2d to 3d */ -void gp_stroke_convertcoords_tpoint(struct Scene *scene, - struct ARegion *region, - struct Object *ob, - const struct tGPspoint *point2D, - float *depth, - float out[3]); +void gpencil_stroke_convertcoords_tpoint(struct Scene *scene, + struct ARegion *region, + struct Object *ob, + const struct tGPspoint *point2D, + float *depth, + float out[3]); /* Poll Callbacks ------------------------------------ */ /* gpencil_utils.c */ -bool gp_add_poll(struct bContext *C); -bool gp_active_layer_poll(struct bContext *C); -bool gp_active_brush_poll(struct bContext *C); -bool gp_brush_crt_presets_poll(bContext *C); +bool gpencil_add_poll(struct bContext *C); +bool gpencil_active_layer_poll(struct bContext *C); +bool gpencil_active_brush_poll(struct bContext *C); +bool gpencil_brush_create_presets_poll(bContext *C); /* Copy/Paste Buffer --------------------------------- */ /* gpencil_edit.c */ -extern ListBase gp_strokes_copypastebuf; +extern ListBase gpencil_strokes_copypastebuf; /* Build a map for converting between old colornames and destination-color-refs */ -struct GHash *gp_copybuf_validate_colormap(struct bContext *C); +struct GHash *gpencil_copybuf_validate_colormap(struct bContext *C); /* Stroke Editing ------------------------------------ */ -void gp_stroke_delete_tagged_points(bGPDframe *gpf, - bGPDstroke *gps, - bGPDstroke *next_stroke, - int tag_flags, - bool select, - int limit); -int gp_delete_selected_point_wrap(bContext *C); +void gpencil_stroke_delete_tagged_points(bGPDframe *gpf, + bGPDstroke *gps, + bGPDstroke *next_stroke, + int tag_flags, + bool select, + int limit); +int gpencil_delete_selected_point_wrap(bContext *C); -void gp_subdivide_stroke(bGPDstroke *gps, const int subdivide); +void gpencil_subdivide_stroke(bGPDstroke *gps, const int subdivide); /* Layers Enums -------------------------------------- */ |