diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-01-20 11:22:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-20 11:22:44 +0300 |
commit | fb26d25405319191eed286a0f9bdd58b899c6009 (patch) | |
tree | 1b3e234257eaaf9ada8838dff39ce87ddb83cfe3 /release | |
parent | 3fb8191d1dbd5c50c8bd5b0821e7cf1bb9885736 (diff) | |
parent | 6395937b01f0f6ca8669d694edcf9e7d258a30a1 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_fluid.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 6b0dd7ac36f..6252ba3bb74 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -1088,13 +1088,7 @@ class PHYSICS_PT_cache(PhysicButtonsPanel, Panel): col.separator() split = layout.split() - bake_incomplete = (domain.cache_frame_pause_data < domain.cache_frame_end) - if domain.has_cache_baked_data and not domain.is_cache_baking_data and bake_incomplete: - col = split.column() - col.operator("fluid.bake_all", text="Resume") - col = split.column() - col.operator("fluid.free_all", text="Free") - elif domain.is_cache_baking_data and not domain.has_cache_baked_data: + if domain.is_cache_baking_data and not domain.has_cache_baked_data: split.enabled = False split.operator("fluid.pause_bake", text="Baking All - ESC to pause") elif not domain.has_cache_baked_data and not domain.is_cache_baking_data: |