diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-08-06 02:38:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-06 02:38:25 +0300 |
commit | 85ddba475baec0737367069a019e0d2a98dacbd7 (patch) | |
tree | 83252ce67f7fb5445894ed4bc16d6909b9f9fff6 /source/blender/editors/sculpt_paint | |
parent | 675700d94892832b264f8b37d3d907c527a83cf5 (diff) |
Cleanup: no need for plural for term 'collision'
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_cloth.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.c b/source/blender/editors/sculpt_paint/sculpt_cloth.c index c6feef0808c..cfcd34ce3a5 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.c +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c @@ -907,7 +907,11 @@ void SCULPT_do_cloth_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode if (SCULPT_stroke_is_first_brush_step(ss->cache) || !ss->cache->cloth_sim) { const bool is_cloth_deform_brush = SCULPT_is_cloth_deform_brush(brush); ss->cache->cloth_sim = cloth_brush_simulation_create( - ss, brush, brush->cloth_mass, brush->cloth_damping, brush->flag2 & BRUSH_CLOTH_USE_COLLISIONS); + ss, + brush, + brush->cloth_mass, + brush->cloth_damping, + (brush->flag2 & BRUSH_CLOTH_USE_COLLISION)); for (int i = 0; i < totverts; i++) { copy_v3_v3(ss->cache->cloth_sim->last_iteration_pos[i], SCULPT_vertex_co_get(ss, i)); copy_v3_v3(ss->cache->cloth_sim->init_pos[i], SCULPT_vertex_co_get(ss, i)); @@ -1182,7 +1186,8 @@ static int sculpt_cloth_filter_invoke(bContext *C, wmOperator *op, const wmEvent const float cloth_mass = RNA_float_get(op->ptr, "cloth_mass"); const float cloth_damping = RNA_float_get(op->ptr, "cloth_damping"); const bool use_collisions = RNA_boolean_get(op->ptr, "use_collisions"); - ss->filter_cache->cloth_sim = cloth_brush_simulation_create(ss, NULL, cloth_mass, cloth_damping, use_collisions); + ss->filter_cache->cloth_sim = cloth_brush_simulation_create( + ss, NULL, cloth_mass, cloth_damping, use_collisions); copy_v3_v3(ss->filter_cache->cloth_sim_pinch_point, SCULPT_active_vertex_co_get(ss)); |