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:
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_fluid.py51
1 files changed, 36 insertions, 15 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 8dd5b935922..427f8c2c85f 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -731,11 +731,18 @@ class PHYSICS_PT_noise(PhysicButtonsPanel, Panel):
# Deactivate bake operator if data has not been baked yet.
note_flag = True
- if domain.use_noise and not domain.has_cache_baked_data and domain.cache_type == 'MODULAR':
- note = layout.split()
- note_flag = False
- note.enabled = note_flag
- note.label(icon='INFO', text="Unbaked Data: Bake Data first")
+ if domain.use_noise and domain.cache_type == 'MODULAR':
+ label = ""
+ if not domain.has_cache_baked_data:
+ label = "Unbaked Data: Bake Data first"
+ if not domain.cache_resumable:
+ label = "Non Resumable Cache: Enable resumable option first"
+
+ if label:
+ note = layout.split()
+ note_flag = False
+ note.enabled = note_flag
+ note.label(icon='INFO', text=label)
split = layout.split()
split.enabled = domain.has_cache_baked_data and note_flag and ob.mode == 'OBJECT'
@@ -817,11 +824,18 @@ class PHYSICS_PT_mesh(PhysicButtonsPanel, Panel):
# Deactivate bake operator if data has not been baked yet.
note_flag = True
- if domain.use_mesh and not domain.has_cache_baked_data and domain.cache_type == 'MODULAR':
- note = layout.split()
- note_flag = False
- note.enabled = note_flag
- note.label(icon='INFO', text="Unbaked Data: Bake Data first")
+ if domain.use_mesh and domain.cache_type == 'MODULAR':
+ label = ""
+ if not domain.has_cache_baked_data:
+ label = "Unbaked Data: Bake Data first"
+ if not domain.cache_resumable:
+ label = "Non Resumable Cache: Enable resumable option first"
+
+ if label:
+ note = layout.split()
+ note_flag = False
+ note.enabled = note_flag
+ note.label(icon='INFO', text=label)
split = layout.split()
split.enabled = domain.has_cache_baked_data and note_flag and ob.mode == 'OBJECT'
@@ -931,11 +945,18 @@ class PHYSICS_PT_particles(PhysicButtonsPanel, Panel):
# Deactivate bake operator if data has not been baked yet.
note_flag = True
- if using_particles and not domain.has_cache_baked_data and domain.cache_type == 'MODULAR':
- note = layout.split()
- note_flag = False
- note.enabled = note_flag
- note.label(icon='INFO', text="Unbaked Data: Bake Data first")
+ if using_particles and domain.cache_type == 'MODULAR':
+ label = ""
+ if not domain.has_cache_baked_data:
+ label = "Unbaked Data: Bake Data first"
+ if not domain.cache_resumable:
+ label = "Non Resumable Cache: Enable resumable option first"
+
+ if label:
+ note = layout.split()
+ note_flag = False
+ note.enabled = note_flag
+ note.label(icon='INFO', text=label)
split = layout.split()
split.enabled = (