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:
authorDaniel Genrich <daniel.genrich@gmx.net>2012-04-29 01:46:43 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2012-04-29 01:46:43 +0400
commit8bf8a128c2f1df5c85ee0005d1821316d3e88261 (patch)
treeabbc6dc6eedefc185dd27c96b39a027a9ce19d38 /release/scripts/startup/bl_ui/properties_physics_smoke.py
parent4465d2f419a8515df41a8fc415774eedaef0e6f6 (diff)
Smoke: Support for moving obstacles. (Merge from Smoke2 branch)
Sponsored by the Blender Development Fund. http://www.blender.org/blenderorg/blender-foundation/development-fund/ Remarks: The original code was not designed to support moving obstacles so I had to introduce some velocity constraints into the code to prevent smoke from exploding. If this causes problems with "fire" emulation, please let me know.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_smoke.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_smoke.py9
1 files changed, 9 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 9f760f2f024..d3ab616a793 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -100,6 +100,15 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel):
sub.prop(flow, "use_absolute")
sub.prop(flow, "density")
sub.prop(flow, "temperature")
+
+ elif md.smoke_type == 'COLLISION':
+ coll = md.coll_settings
+
+ split = layout.split()
+
+ col = split.column()
+ col.prop(coll, "collision_type")
+
class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, Panel):