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>2010-01-25 18:10:14 +0300
committerDaniel Genrich <daniel.genrich@gmx.net>2010-01-25 18:10:14 +0300
commit83dfade37a746043dfc8d38f57514706d8505352 (patch)
tree71d291a00799e67ecc6d39a5c5fc2117037a1328 /release/scripts/ui
parent4b71eaa4d14af6f43c15f97d8bf70506afad724b (diff)
Smoke: The well known Miika Hämäläinen (aka MiikaH) patch (http://blenderartists.org/forum/showthread.php?t=158317&page=42)
* Better (and windows enabled) OpenMP handling (> 2x-5x speed) * More Volumetric Texture mapping options (heat, etc) <-- Matt if that's not to your liking, just revert that part, it's separate anyway * Initial velocity taken from particle settings (no more slow starting) * Option to select compression method (there seem to be a bug in my high compression usage, at least it's been reported to result in exploding smoke - better use low compression for the time being) It's been tested since a while but as usual please report any (new!) bugs. ;-)
Diffstat (limited to 'release/scripts/ui')
-rw-r--r--release/scripts/ui/properties_physics_smoke.py14
-rw-r--r--release/scripts/ui/properties_texture.py1
2 files changed, 15 insertions, 0 deletions
diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py
index b390b32cadc..b7ad29ba80a 100644
--- a/release/scripts/ui/properties_physics_smoke.py
+++ b/release/scripts/ui/properties_physics_smoke.py
@@ -86,6 +86,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
col.label(text="Behavior:")
col.prop(domain, "alpha")
col.prop(domain, "beta")
+ col.prop(domain, "initial_velocity", text="Initial Velocity")
col.prop(domain, "dissolve_smoke", text="Dissolve")
sub = col.column()
sub.active = domain.dissolve_smoke
@@ -155,6 +156,12 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
return md and (md.smoke_type == 'TYPE_DOMAIN')
def draw(self, context):
+
+ domain = context.smoke.domain_settings
+
+ self.layout.prop(domain, "smoke_cache_comp")
+
+
md = context.smoke.domain_settings
cache = md.point_cache_low
@@ -203,6 +210,13 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
return md and (md.smoke_type == 'TYPE_DOMAIN') and md.domain_settings.highres
def draw(self, context):
+
+
+ domain = context.smoke.domain_settings
+
+ self.layout.prop(domain, "smoke_cache_high_comp")
+
+
md = context.smoke.domain_settings
cache = md.point_cache_high
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py
index ab72de1abcb..ebe64c3d459 100644
--- a/release/scripts/ui/properties_texture.py
+++ b/release/scripts/ui/properties_texture.py
@@ -851,6 +851,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel):
layout.prop(vd, "resolution")
elif vd.file_format == 'SMOKE':
layout.prop(vd, "domain_object")
+ layout.prop(vd, "smoke_data_type")
elif vd.file_format == 'IMAGE_SEQUENCE':
layout.template_image(tex, "image", tex.image_user)