diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-13 17:18:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-13 17:51:51 +0300 |
| commit | 6b0d1ef7e118f679fb5dacac184a7e72fef6142e (patch) | |
| tree | c514f73902d4b533104ff182047ffe2373691c4c /source/blender/editors/sculpt_paint/paint_stroke.c | |
| parent | 27b82bbb75c5fd527b6b22682f8d173f6040644a (diff) | |
Cleanup: compiler warnings
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_stroke.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index d2173ed0d96..c764933fcf0 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -775,17 +775,19 @@ static int paint_space_stroke(bContext *C, Brush *brush = BKE_paint_brush(paint); int cnt = 0; - float pressure, dpressure; - float mouse[2], dmouse[2]; - float world_space_position[3], d_world_space_position[3], final_world_space_position[3]; - float length; + const bool use_scene_spacing = paint_stroke_use_scene_spacing(brush, mode); + float d_world_space_position[3] = {0.0f}; + float no_pressure_spacing = paint_space_stroke_spacing(C, scene, stroke, 1.0f, 1.0f); - pressure = stroke->last_pressure; - dpressure = final_pressure - stroke->last_pressure; + float pressure = stroke->last_pressure; + float dpressure = final_pressure - stroke->last_pressure; + + float dmouse[2]; sub_v2_v2v2(dmouse, final_mouse, stroke->last_mouse_position); - length = normalize_v2(dmouse); + float length = normalize_v2(dmouse); - if (paint_stroke_use_scene_spacing(brush, mode)) { + if (use_scene_spacing) { + float world_space_position[3]; bool hit = sculpt_stroke_get_location(C, world_space_position, final_mouse); mul_m4_v3(stroke->vc.obact->obmat, world_space_position); if (hit && stroke->stroke_over_mesh) { @@ -795,6 +797,7 @@ static int paint_space_stroke(bContext *C, } else { length = 0.0f; + zero_v3(d_world_space_position); stroke->stroke_over_mesh = hit; if (stroke->stroke_over_mesh) { copy_v3_v3(stroke->last_world_space_position, world_space_position); @@ -805,9 +808,11 @@ static int paint_space_stroke(bContext *C, while (length > 0.0f) { float spacing = paint_space_stroke_spacing_variable( C, scene, stroke, pressure, dpressure, length); + float mouse[2]; if (length >= spacing) { - if (paint_stroke_use_scene_spacing(brush, mode)) { + if (use_scene_spacing) { + float final_world_space_position[3]; normalize_v3(d_world_space_position); mul_v3_v3fl(final_world_space_position, d_world_space_position, spacing); add_v3_v3v3(final_world_space_position, |