[Bf-blender-cvs] [ee590724ac4] fluid-mantaflow: disable mesh and fluid noise toggle during bake
Sebastián Barschkis
noreply at git.blender.org
Sun May 6 00:12:20 CEST 2018
Commit: ee590724ac4a96bb79ec43d24466a1ebdd30b4a2
Author: Sebastián Barschkis
Date: Sat May 5 23:55:55 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBee590724ac4a96bb79ec43d24466a1ebdd30b4a2
disable mesh and fluid noise toggle during bake
===================================================================
M release/scripts/startup/bl_ui/properties_physics_smoke.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index 2b69f93c862..9283a4035e5 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -366,6 +366,9 @@ class PHYSICS_PT_smoke_noise(PhysicButtonsPanel, Panel):
def draw_header(self, context):
md = context.smoke.domain_settings
+ domain = context.smoke.domain_settings
+ baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise
+ self.layout.enabled = not baking_any
self.layout.prop(md, "use_noise", text="")
def draw(self, context):
@@ -376,14 +379,11 @@ class PHYSICS_PT_smoke_noise(PhysicButtonsPanel, Panel):
baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise
- split = layout.split()
- split.enabled = not domain.cache_baked_noise and not baking_any
- split.prop(domain, "noise_scale", text="Upres")
-
split = layout.split()
split.enabled = not domain.cache_baked_noise and not baking_any
col = split.column(align=True)
+ col.prop(domain, "noise_scale", text="Upres")
# TODO (sebbas): Mantaflow only supports wavelet noise. Do we really need fft noise? Maybe get rid of noise type ...
col.label(text="Noise Method:")
col.prop(domain, "noise_type", text="")
@@ -412,6 +412,9 @@ class PHYSICS_PT_smoke_mesh(PhysicButtonsPanel, Panel):
def draw_header(self, context):
md = context.smoke.domain_settings
+ domain = context.smoke.domain_settings
+ baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise
+ self.layout.enabled = not baking_any
self.layout.prop(md, "use_mesh", text="")
def draw(self, context):
@@ -474,11 +477,13 @@ class PHYSICS_PT_smoke_particles(PhysicButtonsPanel, Panel):
layout = self.layout
domain = context.smoke.domain_settings
+ baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise
+
split = layout.split()
split.prop(domain, "particle_scale", text="Upres")
+ split.enabled = not domain.cache_baked_particles and not baking_any
split = layout.split()
- baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise
split.enabled = not domain.cache_baked_particles and not baking_any
col = split.column()
More information about the Bf-blender-cvs
mailing list