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_linestyle.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_linestyle.h')
-rw-r--r-- | source/blender/blenkernel/BKE_linestyle.h | 96 |
1 files changed, 62 insertions, 34 deletions
diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h index 68ca15fdf57..79579b43446 100644 --- a/source/blender/blenkernel/BKE_linestyle.h +++ b/source/blender/blenkernel/BKE_linestyle.h @@ -31,10 +31,10 @@ extern "C" { #endif -#define LS_MODIFIER_TYPE_COLOR 1 -#define LS_MODIFIER_TYPE_ALPHA 2 -#define LS_MODIFIER_TYPE_THICKNESS 3 -#define LS_MODIFIER_TYPE_GEOMETRY 4 +#define LS_MODIFIER_TYPE_COLOR 1 +#define LS_MODIFIER_TYPE_ALPHA 2 +#define LS_MODIFIER_TYPE_THICKNESS 3 +#define LS_MODIFIER_TYPE_GEOMETRY 4 struct ColorBand; struct Main; @@ -44,42 +44,70 @@ struct bContext; void BKE_linestyle_init(struct FreestyleLineStyle *linestyle); FreestyleLineStyle *BKE_linestyle_new(struct Main *bmain, const char *name); -void BKE_linestyle_free(FreestyleLineStyle *linestyle); -void BKE_linestyle_copy_data( - struct Main *bmain, struct FreestyleLineStyle *linestyle_dst, const struct FreestyleLineStyle *linestyle_src, - const int flag); +void BKE_linestyle_free(FreestyleLineStyle *linestyle); +void BKE_linestyle_copy_data(struct Main *bmain, + struct FreestyleLineStyle *linestyle_dst, + const struct FreestyleLineStyle *linestyle_src, + const int flag); FreestyleLineStyle *BKE_linestyle_copy(struct Main *bmain, const FreestyleLineStyle *linestyle); -void BKE_linestyle_make_local(struct Main *bmain, struct FreestyleLineStyle *linestyle, const bool lib_local); +void BKE_linestyle_make_local(struct Main *bmain, + struct FreestyleLineStyle *linestyle, + const bool lib_local); FreestyleLineStyle *BKE_linestyle_active_from_view_layer(struct ViewLayer *view_layer); -LineStyleModifier *BKE_linestyle_color_modifier_add(FreestyleLineStyle *linestyle, const char *name, int type); -LineStyleModifier *BKE_linestyle_alpha_modifier_add(FreestyleLineStyle *linestyle, const char *name, int type); -LineStyleModifier *BKE_linestyle_thickness_modifier_add(FreestyleLineStyle *linestyle, const char *name, int type); -LineStyleModifier *BKE_linestyle_geometry_modifier_add(FreestyleLineStyle *linestyle, const char *name, int type); - -LineStyleModifier *BKE_linestyle_color_modifier_copy( - FreestyleLineStyle *linestyle, const LineStyleModifier *m, const int flag); -LineStyleModifier *BKE_linestyle_alpha_modifier_copy( - FreestyleLineStyle *linestyle, const LineStyleModifier *m, const int flag); -LineStyleModifier *BKE_linestyle_thickness_modifier_copy( - FreestyleLineStyle *linestyle, const LineStyleModifier *m, const int flag); -LineStyleModifier *BKE_linestyle_geometry_modifier_copy( - FreestyleLineStyle *linestyle, const LineStyleModifier *m, const int flag); - -int BKE_linestyle_color_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); -int BKE_linestyle_alpha_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); -int BKE_linestyle_thickness_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); -int BKE_linestyle_geometry_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); - -bool BKE_linestyle_color_modifier_move(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction); -bool BKE_linestyle_alpha_modifier_move(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction); -bool BKE_linestyle_thickness_modifier_move(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction); -bool BKE_linestyle_geometry_modifier_move(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction); +LineStyleModifier *BKE_linestyle_color_modifier_add(FreestyleLineStyle *linestyle, + const char *name, + int type); +LineStyleModifier *BKE_linestyle_alpha_modifier_add(FreestyleLineStyle *linestyle, + const char *name, + int type); +LineStyleModifier *BKE_linestyle_thickness_modifier_add(FreestyleLineStyle *linestyle, + const char *name, + int type); +LineStyleModifier *BKE_linestyle_geometry_modifier_add(FreestyleLineStyle *linestyle, + const char *name, + int type); + +LineStyleModifier *BKE_linestyle_color_modifier_copy(FreestyleLineStyle *linestyle, + const LineStyleModifier *m, + const int flag); +LineStyleModifier *BKE_linestyle_alpha_modifier_copy(FreestyleLineStyle *linestyle, + const LineStyleModifier *m, + const int flag); +LineStyleModifier *BKE_linestyle_thickness_modifier_copy(FreestyleLineStyle *linestyle, + const LineStyleModifier *m, + const int flag); +LineStyleModifier *BKE_linestyle_geometry_modifier_copy(FreestyleLineStyle *linestyle, + const LineStyleModifier *m, + const int flag); + +int BKE_linestyle_color_modifier_remove(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier); +int BKE_linestyle_alpha_modifier_remove(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier); +int BKE_linestyle_thickness_modifier_remove(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier); +int BKE_linestyle_geometry_modifier_remove(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier); + +bool BKE_linestyle_color_modifier_move(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier, + int direction); +bool BKE_linestyle_alpha_modifier_move(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier, + int direction); +bool BKE_linestyle_thickness_modifier_move(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier, + int direction); +bool BKE_linestyle_geometry_modifier_move(FreestyleLineStyle *linestyle, + LineStyleModifier *modifier, + int direction); void BKE_linestyle_modifier_list_color_ramps(FreestyleLineStyle *linestyle, ListBase *listbase); -char *BKE_linestyle_path_to_color_ramp(FreestyleLineStyle *linestyle, struct ColorBand *color_ramp); +char *BKE_linestyle_path_to_color_ramp(FreestyleLineStyle *linestyle, + struct ColorBand *color_ramp); bool BKE_linestyle_use_textures(FreestyleLineStyle *linestyle, const bool use_shading_nodes); @@ -89,4 +117,4 @@ void BKE_linestyle_default_shader(const struct bContext *C, FreestyleLineStyle * } #endif -#endif /* __BKE_LINESTYLE_H__ */ +#endif /* __BKE_LINESTYLE_H__ */ |