diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2018-02-24 16:02:50 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2018-02-24 16:02:50 +0300 |
| commit | 94eb1897523d4cf464ea0cdf90ccbd7db90f997d (patch) | |
| tree | bcb82d0c8360f195046ab93b1a222acf0ad0f4f1 /release/scripts/startup/bl_ui/properties_physics_smoke.py | |
| parent | c4abb331027ab294618c5ab49d3f9d2dfc67596f (diff) | |
| parent | 4403ca80bda690c0ac44e4a6db0cddf4b2428006 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_smoke.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_smoke.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 5cf89df63ab..d02bee3a0fa 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -68,6 +68,8 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel): col.prop(domain, "time_scale", text="Scale") col.label(text="Border Collisions:") col.prop(domain, "collision_extents", text="") + col.label(text="Empty Space:") + col.prop(domain, "clipping") col = split.column() col.label(text="Behavior:") |