Smoke: decoupling of wavelet #2, new noise strength option on gui, fftw3 option in...
[blender.git] / release / ui / buttons_physics_smoke.py
index a128fe3afb13a717550b9dee2106b05a990274c8..f2b3bc35ed882212bc4dd1de745319500db4cb57 100644 (file)
@@ -41,7 +41,6 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
                        layout.itemR(md, "smoke_type")
                
                        if md.smoke_type == 'TYPE_DOMAIN':
-                               
                                split = layout.split()
                                
                                col = split.column()
@@ -55,11 +54,15 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
                                sub.active = md.domain_settings.highres
                                sub.itemR(md.domain_settings, "amplify", text="High")
                                col.itemR(md.domain_settings, "highres", text="Use High Resolution")
+                               col.itemR(md.domain_settings, "strength")
                                
-                               sub = split.column()
-                               sub.itemL(text="Display:")
-                               sub.itemR(md.domain_settings, "visibility")
-                               sub.itemR(md.domain_settings, "color")
+                               col = split.column()
+                               col.itemL(text="Display:")
+                               col.itemR(md.domain_settings, "visibility")
+                               col.itemR(md.domain_settings, "color", slider=True)
+                               sub = col.column()
+                               sub.active = md.domain_settings.highres
+                               sub.itemR(md.domain_settings, "viewhighres")
                                
                                layout.itemL(text="Noise Type:")
                                layout.itemR(md.domain_settings, "noise_type", expand=True)
@@ -78,11 +81,13 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
                                col.itemR(md.domain_settings, "coll_group", text="")
                                
                        elif md.smoke_type == 'TYPE_FLOW':
-                               
-                               layout.itemR(md.flow_settings, "outflow")
-                               
                                split = layout.split()
                                
+                               col = split.column()
+                               col.itemR(md.flow_settings, "outflow")
+                               col.itemL(text="Particle System:")
+                               col.item_pointerR(md.flow_settings, "psys", ob, "particle_systems", text="")
+                               
                                if md.flow_settings.outflow:                            
                                        col = split.column()
                                else:
@@ -90,12 +95,8 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
                                        col.itemL(text="Behavior:")
                                        col.itemR(md.flow_settings, "temperature")
                                        col.itemR(md.flow_settings, "density")
-                               
-                                       sub = split.column()
-                                       sub.itemL(text="particle System:")
-                                       sub.item_pointerR(md.flow_settings, "psys", ob, "particle_systems", text="")
                                        
-                       elif md.smoke_type == 'TYPE_COLL':
-                               layout.itemS()
+                       #elif md.smoke_type == 'TYPE_COLL':
+                       #       layout.itemS()
 
 bpy.types.register(PHYSICS_PT_smoke)
\ No newline at end of file