diff options
author | Pablo Dobarro <pablodp606@gmail.com> | 2020-07-29 18:39:08 +0300 |
---|---|---|
committer | Pablo Dobarro <pablodp606@gmail.com> | 2020-08-06 01:29:22 +0300 |
commit | 675700d94892832b264f8b37d3d907c527a83cf5 (patch) | |
tree | 8ee57049887fe6c98fb713f5255f56cba7b377b8 /release | |
parent | 8c98684e2209ca6da35888d37549832694feea9e (diff) |
Sculpt: Cloth Brush/Filter Collisions
This implements collisions in the solver of the cloth brush/filter. It
uses the scene colliders as a regular physics simulation.
There are still some parameters (friction, distance to the surface...)
that can be exposed as properties in later patches.
Thanks to Sebastian Parborg for helping me with the implementation.
Reviewed By: sergey, zeddb
Differential Revision: https://developer.blender.org/D8019
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_paint_common.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index d2b02c4c40b..8afd47f5da6 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -667,6 +667,8 @@ def brush_settings(layout, context, brush, popover=False): layout.prop(brush, "cloth_damping") layout.prop(brush, "cloth_constraint_softbody_strength") layout.separator() + layout.prop(brush, "use_cloth_collisions") + layout.separator() elif sculpt_tool == 'SCRAPE': row = layout.row() diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index c9fb89ffad9..00ae884eeb9 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1278,6 +1278,7 @@ class _defs_sculpt: layout.prop(props, "cloth_mass") layout.prop(props, "cloth_damping") layout.prop(props, "use_face_sets") + layout.prop(props, "use_collisions") return dict( idname="builtin.cloth_filter", |