sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Smoke:

Browse Source 
* UI updates for my last commit by nudelZ
This commit is contained in:
Daniel Genrich 2010-01-25 15:24:48 +00:00
parent 83dfade37a
commit 673b7030ee
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
release/scripts/ui/properties_physics_smoke.py
View File

@ -80,13 +80,14 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
col = split.column()
col.label(text="Resolution:")
col.prop(domain, "maxres", text="Divisions")
col.label(text="Particle:")
col.prop(domain, "initial_velocity", text="Initial Velocity")
if wide_ui:
col = split.column()
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
@ -156,11 +157,12 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
return md and (md.smoke_type == 'TYPE_DOMAIN')
def draw(self, context):
layout = self.layout
domain = context.smoke.domain_settings
self.layout.prop(domain, "smoke_cache_comp")
layout.label(text="Compression:")
layout.prop(domain, "smoke_cache_comp", expand=True)
md = context.smoke.domain_settings
cache = md.point_cache_low
@ -210,11 +212,12 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
return md and (md.smoke_type == 'TYPE_DOMAIN') and md.domain_settings.highres
def draw(self, context):
layout = self.layout
domain = context.smoke.domain_settings
self.layout.prop(domain, "smoke_cache_high_comp")
layout.label(text="Compression:")
layout.prop(domain, "smoke_cache_high_comp", expand=True)
md = context.smoke.domain_settings

4
source/blender/makesrna/intern/rna_smoke.c
View File

@ -118,8 +118,8 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem smoke_cache_comp_items[] = {
{SM_CACHE_HEAVY, "CACHEHEAVY", 0, "Heavy (Very slow)", "Effective but slow compression."},
{SM_CACHE_LIGHT, "CACHELIGHT", 0, "Light (Fast)", "Fast but not so effective compression."},
{SM_CACHE_LIGHT, "CACHELIGHT", 0, "Light", "Fast but not so effective compression."},
{SM_CACHE_HEAVY, "CACHEHEAVY", 0, "Heavy", "Effective but slow compression."},
{0, NULL, 0, NULL, NULL}};
srna = RNA_def_struct(brna, "SmokeDomainSettings", NULL);