diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_gpencil.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/BKE_gpencil.h')
-rw-r--r-- | source/blender/blenkernel/BKE_gpencil.h | 111 |
1 files changed, 66 insertions, 45 deletions
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index a22d30a01fa..2e5d5911239 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -68,7 +68,7 @@ void BKE_gpencil_stroke_sync_selection(struct bGPDstroke *gps); struct bGPDframe *BKE_gpencil_frame_addnew(struct bGPDlayer *gpl, int cframe); struct bGPDframe *BKE_gpencil_frame_addcopy(struct bGPDlayer *gpl, int cframe); struct bGPDlayer *BKE_gpencil_layer_addnew(struct bGPdata *gpd, const char *name, bool setactive); -struct bGPdata *BKE_gpencil_data_addnew(struct Main *bmain, const char name[]); +struct bGPdata *BKE_gpencil_data_addnew(struct Main *bmain, const char name[]); struct bGPDframe *BKE_gpencil_frame_duplicate(const struct bGPDframe *gpf_src); struct bGPDlayer *BKE_gpencil_layer_duplicate(const struct bGPDlayer *gpl_src); @@ -76,8 +76,10 @@ void BKE_gpencil_frame_copy_strokes(struct bGPDframe *gpf_src, struct bGPDframe struct bGPDstroke *BKE_gpencil_stroke_duplicate(struct bGPDstroke *gps_src); void BKE_gpencil_copy_data(struct bGPdata *gpd_dst, const struct bGPdata *gpd_src, const int flag); -struct bGPdata *BKE_gpencil_copy(struct Main *bmain, const struct bGPdata *gpd); -struct bGPdata *BKE_gpencil_data_duplicate(struct Main *bmain, const struct bGPdata *gpd, bool internal_copy); +struct bGPdata *BKE_gpencil_copy(struct Main *bmain, const struct bGPdata *gpd); +struct bGPdata *BKE_gpencil_data_duplicate(struct Main *bmain, + const struct bGPdata *gpd, + bool internal_copy); void BKE_gpencil_make_local(struct Main *bmain, struct bGPdata *gpd, const bool lib_local); @@ -85,7 +87,9 @@ void BKE_gpencil_frame_delete_laststroke(struct bGPDlayer *gpl, struct bGPDframe /* materials */ void BKE_gpencil_material_index_remove(struct bGPdata *gpd, int index); -void BKE_gpencil_material_remap(struct bGPdata *gpd, const unsigned int *remap, unsigned int remap_len); +void BKE_gpencil_material_remap(struct bGPdata *gpd, + const unsigned int *remap, + unsigned int remap_len); /* statistics functions */ void BKE_gpencil_stats_update(struct bGPdata *gpd); @@ -94,14 +98,17 @@ void BKE_gpencil_stats_update(struct bGPdata *gpd); /* - Number of values defining each point in the built-in data * buffers for primitives (e.g. 2D Monkey) */ -#define GP_PRIM_DATABUF_SIZE 5 +#define GP_PRIM_DATABUF_SIZE 5 -void BKE_gpencil_stroke_add_points( - struct bGPDstroke *gps, - const float *array, const int totpoints, - const float mat[4][4]); +void BKE_gpencil_stroke_add_points(struct bGPDstroke *gps, + const float *array, + const int totpoints, + const float mat[4][4]); -struct bGPDstroke *BKE_gpencil_add_stroke(struct bGPDframe *gpf, int mat_idx, int totpoints, short thickness); +struct bGPDstroke *BKE_gpencil_add_stroke(struct bGPDframe *gpf, + int mat_idx, + int totpoints, + short thickness); /* Stroke and Fill - Alpha Visibility Threshold */ #define GPENCIL_ALPHA_OPACITY_THRESH 0.001f @@ -113,16 +120,18 @@ bool gpencil_layer_is_editable(const struct bGPDlayer *gpl); * is no existing GP-Frame on the frame requested. */ typedef enum eGP_GetFrame_Mode { - /* Use the preceding gp-frame (i.e. don't add anything) */ - GP_GETFRAME_USE_PREV = 0, + /* Use the preceding gp-frame (i.e. don't add anything) */ + GP_GETFRAME_USE_PREV = 0, - /* Add a new empty/blank frame */ - GP_GETFRAME_ADD_NEW = 1, - /* Make a copy of the active frame */ - GP_GETFRAME_ADD_COPY = 2, + /* Add a new empty/blank frame */ + GP_GETFRAME_ADD_NEW = 1, + /* Make a copy of the active frame */ + GP_GETFRAME_ADD_COPY = 2, } eGP_GetFrame_Mode; -struct bGPDframe *BKE_gpencil_layer_getframe(struct bGPDlayer *gpl, int cframe, eGP_GetFrame_Mode addnew); +struct bGPDframe *BKE_gpencil_layer_getframe(struct bGPDlayer *gpl, + int cframe, + eGP_GetFrame_Mode addnew); struct bGPDframe *BKE_gpencil_layer_find_frame(struct bGPDlayer *gpl, int cframe); bool BKE_gpencil_layer_delframe(struct bGPDlayer *gpl, struct bGPDframe *gpf); @@ -132,37 +141,43 @@ void BKE_gpencil_layer_delete(struct bGPdata *gpd, struct bGPDlayer *gpl); /* Brush */ struct Material *BKE_gpencil_brush_material_get(struct Brush *brush); -void BKE_gpencil_brush_material_set(struct Brush *brush, struct Material *material); +void BKE_gpencil_brush_material_set(struct Brush *brush, struct Material *material); /* Object */ struct Material *BKE_gpencil_object_material_ensure_active(struct Main *bmain, struct Object *ob); -struct Material *BKE_gpencil_object_material_ensure_from_brush(struct Main *bmain, struct Object *ob, struct Brush *brush); -int BKE_gpencil_object_material_ensure(struct Main *bmain, struct Object *ob, struct Material *material); +struct Material *BKE_gpencil_object_material_ensure_from_brush(struct Main *bmain, + struct Object *ob, + struct Brush *brush); +int BKE_gpencil_object_material_ensure(struct Main *bmain, + struct Object *ob, + struct Material *material); -struct Material *BKE_gpencil_object_material_new(struct Main *bmain, struct Object *ob, const char *name, int *r_index); +struct Material *BKE_gpencil_object_material_new(struct Main *bmain, + struct Object *ob, + const char *name, + int *r_index); -int BKE_gpencil_object_material_get_index(struct Object *ob, struct Material *ma); +int BKE_gpencil_object_material_get_index(struct Object *ob, struct Material *ma); -struct Material *BKE_gpencil_object_material_get_from_brush(struct Object *ob, struct Brush *brush); -int BKE_gpencil_object_material_get_index_from_brush(struct Object *ob, struct Brush *brush); +struct Material *BKE_gpencil_object_material_get_from_brush(struct Object *ob, + struct Brush *brush); +int BKE_gpencil_object_material_get_index_from_brush(struct Object *ob, struct Brush *brush); struct Material *BKE_gpencil_object_material_ensure_from_active_input_toolsettings( - struct Main *bmain, struct Object *ob, struct ToolSettings *ts); -struct Material *BKE_gpencil_object_material_ensure_from_active_input_brush( - struct Main *bmain, struct Object *ob, struct Brush *brush); -struct Material *BKE_gpencil_object_material_ensure_from_active_input_material( - struct Main *bmain, struct Object *ob); - + struct Main *bmain, struct Object *ob, struct ToolSettings *ts); +struct Material *BKE_gpencil_object_material_ensure_from_active_input_brush(struct Main *bmain, + struct Object *ob, + struct Brush *brush); +struct Material *BKE_gpencil_object_material_ensure_from_active_input_material(struct Main *bmain, + struct Object *ob); /* object boundbox */ -bool BKE_gpencil_data_minmax( - const struct bGPdata *gpd, - float r_min[3], float r_max[3]); -bool BKE_gpencil_stroke_minmax( - const struct bGPDstroke *gps, const bool use_select, - float r_min[3], float r_max[3]); -bool BKE_gpencil_stroke_select_check( - const struct bGPDstroke *gps); +bool BKE_gpencil_data_minmax(const struct bGPdata *gpd, float r_min[3], float r_max[3]); +bool BKE_gpencil_stroke_minmax(const struct bGPDstroke *gps, + const bool use_select, + float r_min[3], + float r_max[3]); +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]); @@ -182,12 +197,17 @@ void BKE_gpencil_simplify_fixed(struct bGPDstroke *gps); void BKE_gpencil_subdivide(struct bGPDstroke *gps, int level, int flag); bool BKE_gpencil_trim_stroke(struct bGPDstroke *gps); -void BKE_gpencil_stroke_2d_flat( - const struct bGPDspoint *points, int totpoints, float(*points2d)[2], int *r_direction); -void BKE_gpencil_stroke_2d_flat_ref( - const struct bGPDspoint *ref_points, int ref_totpoints, - const struct bGPDspoint *points, int totpoints, - float(*points2d)[2], const float scale, int *r_direction); +void BKE_gpencil_stroke_2d_flat(const struct bGPDspoint *points, + int totpoints, + float (*points2d)[2], + int *r_direction); +void BKE_gpencil_stroke_2d_flat_ref(const struct bGPDspoint *ref_points, + int ref_totpoints, + const struct bGPDspoint *points, + int totpoints, + float (*points2d)[2], + const float scale, + int *r_direction); void BKE_gpencil_transform(struct bGPdata *gpd, float mat[4][4]); @@ -197,7 +217,8 @@ bool BKE_gpencil_smooth_stroke_thickness(struct bGPDstroke *gps, int point_index bool BKE_gpencil_smooth_stroke_uv(struct bGPDstroke *gps, int point_index, float influence); void BKE_gpencil_get_range_selected(struct bGPDlayer *gpl, int *r_initframe, int *r_endframe); -float BKE_gpencil_multiframe_falloff_calc(struct bGPDframe *gpf, int actnum, int f_init, int f_end, struct CurveMapping *cur_falloff); +float BKE_gpencil_multiframe_falloff_calc( + struct bGPDframe *gpf, int actnum, int f_init, int f_end, struct CurveMapping *cur_falloff); extern void (*BKE_gpencil_batch_cache_dirty_tag_cb)(struct bGPdata *gpd); extern void (*BKE_gpencil_batch_cache_free_cb)(struct bGPdata *gpd); |