diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 17:42:07 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 18:30:10 +0300 |
commit | 4235fe37d6aaf9963ddda23ccaec26a483b6a580 (patch) | |
tree | 43461c553660a9ed476883d4caa0f347ca79a922 /release/scripts/startup/bl_ui/properties_physics_common.py | |
parent | 2aa4301c88aac15d81e08b1f5ac24da2a9279243 (diff) |
Mantaflow [Part 3]: Customized UI for Manta fluids
With Mantaflow the current smoke modifier UI will accommodate both smoke and liquids.
In addition, there is now an option for Mantaflow liquids in the quick effects section ("Quick Liquid").
Reviewed By: sergey
Maniphest Tasks: T59995
Differential Revision: https://developer.blender.org/D3852
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_common.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_common.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index b69f2233035..5397020a521 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -99,8 +99,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel): physics_add(col, context.soft_body, "Soft Body", 'SOFT_BODY', 'MOD_SOFT', True) if obj.type == 'MESH': - physics_add(col, context.fluid, "Fluid", 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True) - physics_add(col, context.smoke, "Smoke", 'SMOKE', 'MOD_SMOKE', True) + physics_add(col, context.fluid, "Fluid", 'FLUID', 'MOD_FLUIDSIM', True) physics_add_special( col, obj.rigid_body, "Rigid Body", @@ -118,7 +117,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel): ) -# cache-type can be 'PSYS' 'HAIR' 'SMOKE' etc. +# cache-type can be 'PSYS' 'HAIR' 'FLUID' etc. def point_cache_ui(self, cache, enabled, cachetype): layout = self.layout @@ -141,10 +140,10 @@ def point_cache_ui(self, cache, enabled, cachetype): col.operator("ptcache.add", icon='ADD', text="") col.operator("ptcache.remove", icon='REMOVE', text="") - if cachetype in {'PSYS', 'HAIR', 'SMOKE'}: + if cachetype in {'PSYS', 'HAIR', 'FLUID'}: col = layout.column() - if cachetype == 'SMOKE': + if cachetype == 'FLUID': col.prop(cache, "use_library_path", text="Use Library Path") col.prop(cache, "use_external") @@ -160,14 +159,14 @@ def point_cache_ui(self, cache, enabled, cachetype): col.alignment = 'RIGHT' col.label(text=cache_info) else: - if cachetype in {'SMOKE', 'DYNAMIC_PAINT'}: + if cachetype in {'FLUID', 'DYNAMIC_PAINT'}: if not is_saved: col = layout.column(align=True) col.alignment = 'RIGHT' col.label(text="Cache is disabled until the file is saved") layout.enabled = False - if not cache.use_external or cachetype == 'SMOKE': + if not cache.use_external or cachetype == 'FLUID': col = layout.column(align=True) if cachetype not in {'PSYS', 'DYNAMIC_PAINT'}: @@ -175,18 +174,18 @@ def point_cache_ui(self, cache, enabled, cachetype): col.prop(cache, "frame_start", text="Simulation Start") col.prop(cache, "frame_end") - if cachetype not in {'SMOKE', 'CLOTH', 'DYNAMIC_PAINT', 'RIGID_BODY'}: + if cachetype not in {'FLUID', 'CLOTH', 'DYNAMIC_PAINT', 'RIGID_BODY'}: col.prop(cache, "frame_step") cache_info = cache.info - if cachetype != 'SMOKE' and cache_info: # avoid empty space. + if cachetype != 'FLUID' and cache_info: # avoid empty space. col = layout.column(align=True) col.alignment = 'RIGHT' col.label(text=cache_info) can_bake = True - if cachetype not in {'SMOKE', 'DYNAMIC_PAINT', 'RIGID_BODY'}: + if cachetype not in {'FLUID', 'DYNAMIC_PAINT', 'RIGID_BODY'}: if not is_saved: col = layout.column(align=True) col.alignment = 'RIGHT' @@ -269,7 +268,7 @@ def effector_weights_ui(self, weights, weight_type): col.prop(weights, "curve_guide", slider=True) col.prop(weights, "texture", slider=True) - if weight_type != 'SMOKE': + if weight_type != 'FLUID': col.prop(weights, "smokeflow", slider=True) col = flow.column() |