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-09-28 12:47:59 +0400
committerJanne Karhu <jhkarh@gmail.com>2010-09-28 12:47:59 +0400
commit12be522cbe9d4c9ae99555770f546ce6f27b7c21 (patch)
tree3bb36f52a172f68c2f6468499f703fe229ca2049 /release
parent8a68326f8151ea28b1fd559c92eba1847b3330b4 (diff)
Fix for [#24031] Baked Physics with Phsics set to NO can't be freed
* Should fix the cause ("no physics" gets baked) and old files that are effected (ui allows freeing if cache isn't really used)
Diffstat (limited to 'release')
-rw-r--r--release/scripts/ui/properties_particle.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py
index bd6d2e13c88..7f630d6e5ff 100644
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -27,7 +27,13 @@ from properties_physics_common import basic_force_field_falloff_ui
def particle_panel_enabled(context, psys):
- return (psys.point_cache.is_baked is False) and (not psys.is_edited) and (not context.particle_system_editable)
+ phystype = psys.settings.physics_type
+ if phystype == 'NO' or phystype == 'KEYED':
+ return True
+ if psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.use_hair_dynamics):
+ return (psys.point_cache.is_baked is False) and (not psys.is_edited) and (not context.particle_system_editable)
+ else:
+ return True
def particle_panel_poll(cls, context):