diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-12-13 12:39:14 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-12-13 12:39:14 +0300 |
| commit | 4cd06a6526ddb837d445a25c081dce75c2ece979 (patch) | |
| tree | 244bb6d64c8d6f514a51f9344fff9618a9542df3 /release | |
| parent | a4b410af3d67c44a35c9cbf6f09c33a3c41a50af (diff) | |
Fix for [#25185] Toggling hair dynamics without deleting cache leaves hair disattached when mesh animation is controlled by deformers - discussed with Jahka on IRC on Sat
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/ui/properties_particle.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index 6389dcb2207..1565ece3b40 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -234,7 +234,7 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, bpy.types.Panel): #part = psys.settings cloth = psys.cloth.settings - layout.enabled = psys.use_hair_dynamics + layout.enabled = psys.use_hair_dynamics and psys.point_cache.is_baked == False split = layout.split() @@ -274,12 +274,12 @@ class PARTICLE_PT_cache(ParticleButtonsPanel, bpy.types.Panel): phystype = psys.settings.physics_type if phystype == 'NO' or phystype == 'KEYED': return False - return (psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.use_hair_dynamics)) and engine in cls.COMPAT_ENGINES + return (psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and (psys.use_hair_dynamics or psys.point_cache.is_baked))) and engine in cls.COMPAT_ENGINES def draw(self, context): psys = context.particle_system - point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if psys.use_hair_dynamics else 'PSYS') + point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if (psys.settings.type == 'HAIR') else 'PSYS') class PARTICLE_PT_velocity(ParticleButtonsPanel, bpy.types.Panel): |