diff options
| author | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
| commit | bfbf0bb7f7a0191b65fc724d5dfea225e6293c6b (patch) | |
| tree | 042f37d28c9e1cf0ce5a0fb4fd4235288f62d36e /release/scripts/startup/bl_ui/properties_physics_fluid.py | |
| parent | 3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9 (diff) | |
| parent | 78017916f7c7a8ec8907c9b993214ff8ec3c3557 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-reviewtemp-lanpr-review
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_fluid.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_fluid.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 2c8ed363738..833cd05dd81 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -1174,7 +1174,7 @@ class PHYSICS_PT_cache(PhysicButtonsPanel, Panel): 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") + split.operator("fluid.pause_bake", text="Baking All - ESC to cancel") elif not domain.has_cache_baked_data and not domain.is_cache_baking_data: split.operator("fluid.bake_all", text="Bake All") else: |