Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_brush.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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_brush.h')
-rw-r--r--source/blender/blenkernel/BKE_brush.h60
1 files changed, 35 insertions, 25 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index 30746af0b53..eeebfe1f2f6 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -49,7 +49,10 @@ struct Brush *BKE_brush_add(struct Main *bmain, const char *name, const eObjectM
struct Brush *BKE_brush_add_gpencil(struct Main *bmain, struct ToolSettings *ts, const char *name);
void BKE_brush_init_gpencil_settings(struct Brush *brush);
struct Brush *BKE_brush_first_search(struct Main *bmain, const eObjectMode ob_mode);
-void BKE_brush_copy_data(struct Main *bmain, struct Brush *brush_dst, const struct Brush *brush_src, const int flag);
+void BKE_brush_copy_data(struct Main *bmain,
+ struct Brush *brush_dst,
+ const struct Brush *brush_src,
+ const int flag);
struct Brush *BKE_brush_copy(struct Main *bmain, const struct Brush *brush);
void BKE_brush_make_local(struct Main *bmain, struct Brush *brush, const bool lib_local);
void BKE_brush_free(struct Brush *brush);
@@ -61,9 +64,10 @@ void BKE_brush_gpencil_presets(struct bContext *C);
struct ImBuf *get_brush_icon(struct Brush *brush);
/* jitter */
-void BKE_brush_jitter_pos(
- const struct Scene *scene, struct Brush *brush,
- const float pos[2], float jitterpos[2]);
+void BKE_brush_jitter_pos(const struct Scene *scene,
+ struct Brush *brush,
+ const float pos[2],
+ float jitterpos[2]);
void BKE_brush_randomize_texture_coords(struct UnifiedPaintSettings *ups, bool mask);
/* brush curve */
@@ -72,12 +76,17 @@ 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(
- 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(
- const struct Scene *scene, struct Brush *br, const float point[2],
- const int thread, struct ImagePool *pool);
+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(const struct Scene *scene,
+ struct Brush *br,
+ const float point[2],
+ const int thread,
+ struct ImagePool *pool);
/* texture */
unsigned int *BKE_brush_gen_texture_cache(struct Brush *br, int half_side, bool use_secondary);
@@ -91,11 +100,11 @@ const float *BKE_brush_color_get(const struct Scene *scene, const struct Brush *
const float *BKE_brush_secondary_color_get(const struct Scene *scene, const struct Brush *brush);
void BKE_brush_color_set(struct Scene *scene, struct Brush *brush, const float color[3]);
-int BKE_brush_size_get(const struct Scene *scene, const struct Brush *brush);
+int BKE_brush_size_get(const struct Scene *scene, const struct Brush *brush);
void BKE_brush_size_set(struct Scene *scene, struct Brush *brush, int value);
float BKE_brush_unprojected_radius_get(const struct Scene *scene, const struct Brush *brush);
-void BKE_brush_unprojected_radius_set(struct Scene *scene, struct Brush *brush, float value);
+void BKE_brush_unprojected_radius_set(struct Scene *scene, struct Brush *brush, float value);
float BKE_brush_alpha_get(const struct Scene *scene, const struct Brush *brush);
void BKE_brush_alpha_set(struct Scene *scene, struct Brush *brush, float alpha);
@@ -109,24 +118,25 @@ bool BKE_brush_use_size_pressure(const struct Scene *scene, const struct Brush *
bool BKE_brush_sculpt_has_secondary_color(const struct Brush *brush);
/* scale unprojected radius to reflect a change in the brush's 2D size */
-void BKE_brush_scale_unprojected_radius(
- float *unprojected_radius,
- int new_brush_size,
- int old_brush_size);
+void BKE_brush_scale_unprojected_radius(float *unprojected_radius,
+ int new_brush_size,
+ int old_brush_size);
/* scale brush size to reflect a change in the brush's unprojected radius */
-void BKE_brush_scale_size(
- int *r_brush_size,
- float new_unprojected_radius,
- float old_unprojected_radius);
+void BKE_brush_scale_size(int *r_brush_size,
+ float new_unprojected_radius,
+ float old_unprojected_radius);
/* Accessors */
#define BKE_brush_tool_get(brush, p) \
- (CHECK_TYPE_ANY(brush, struct Brush *, const struct Brush *), \
- *(const char *)POINTER_OFFSET(brush, (p)->runtime.tool_offset))
-#define BKE_brush_tool_set(brush, p, tool) { \
- CHECK_TYPE_ANY(brush, struct Brush *); \
- *(char *)POINTER_OFFSET(brush, (p)->runtime.tool_offset) = tool; } ((void)0)
+ (CHECK_TYPE_ANY(brush, struct Brush *, const struct Brush *), \
+ *(const char *)POINTER_OFFSET(brush, (p)->runtime.tool_offset))
+#define BKE_brush_tool_set(brush, p, tool) \
+ { \
+ CHECK_TYPE_ANY(brush, struct Brush *); \
+ *(char *)POINTER_OFFSET(brush, (p)->runtime.tool_offset) = tool; \
+ } \
+ ((void)0)
/* debugging only */
void BKE_brush_debug_print_state(struct Brush *br);