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:
authorLukas Tönne <lukas.toenne@gmail.com>2014-09-17 16:21:06 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-20 11:30:01 +0300
commitbbae8f88b8f305a8ed85cab718d2a66b476da3c1 (patch)
treed1f4950ca2845f098a5d452db31ce390a3ed7dc0 /release
parentbe016daf15de7c1581a096b17c1380a35d742aa0 (diff)
Made the voxel grid size for hair interaction configurable and increased
the default to 32. Conflicts: source/blender/blenloader/intern/versioning_270.c
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_particle.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 87a772efc27..8afd2d02170 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -320,6 +320,10 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel):
sub.prop(cloth, "pressure", slider=True)
sub.prop(cloth, "pressure_threshold", slider=True)
+ sub.separator()
+
+ sub.prop(cloth, "voxel_resolution")
+
col = split.column()
col.label(text="Damping:")
sub = col.column(align=True)