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:
authorJanne Karhu <jhkarh@gmail.com>2010-04-12 21:34:06 +0400
committerJanne Karhu <jhkarh@gmail.com>2010-04-12 21:34:06 +0400
commit919565f196b66026f0adf23ed1ee2214e5a517f7 (patch)
tree4018dfd0df1ce9a7c186e441203debff5aef082c /release/scripts
parent99d755656d4090e922e944e65fe8746c2ccb9602 (diff)
Subframe calculations for particles, original patch by Raul Fernandez Hernandez
* Increasing subframe count increases stability for SPH fluid and Newtonian particles * Also small tweaks into physics ui panel to better fit new subframes value * This commit also fixes the moving fluid emitter problem as described by Raul in the mailinglist
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/ui/properties_particle.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py
index 54ddb6da8a6..f3ab64258d9 100644
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -390,10 +390,13 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
sub.prop(part, "drag_factor", slider=True)
sub.prop(part, "damp_factor", slider=True)
sub = split.column()
+ sub.label(text="Integration:")
+ sub.prop(part, "integrator", text="")
+ sub.prop(part, "time_tweak")
+ sub.prop(part, "subframes")
+ sub = layout.row()
sub.prop(part, "size_deflect")
sub.prop(part, "die_on_collision")
- sub.prop(part, "integrator")
- sub.prop(part, "time_tweak")
elif part.physics_type == 'FLUID':
fluid = part.fluid
@@ -405,10 +408,13 @@ class PARTICLE_PT_physics(ParticleButtonsPanel):
sub.prop(part, "drag_factor", slider=True)
sub.prop(part, "damp_factor", slider=True)
sub = split.column()
+ sub.label(text="Integration:")
+ sub.prop(part, "integrator", text="")
+ sub.prop(part, "time_tweak")
+ sub.prop(part, "subframes")
+ sub = layout.row()
sub.prop(part, "size_deflect")
sub.prop(part, "die_on_collision")
- sub.prop(part, "integrator")
- sub.prop(part, "time_tweak")
split = layout.split()
sub = split.column()