merge of last commit to trunk

2010-05-11 20:06:20 +00:00
parent 3409eb429e
commit aaa7c493e4
6 changed files with 17 additions and 18 deletions
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -269,10 +269,9 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
        return psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.hair_dynamics)

    def draw(self, context):
-
        psys = context.particle_system

-        point_cache_ui(self, context, psys.point_cache, particle_panel_enabled(context, psys), not psys.hair_dynamics, 0)
+        point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if psys.hair_dynamics else 'PSYS')


 class PARTICLE_PT_velocity(ParticleButtonsPanel):