archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Viewport smoke: fix a couple of issues in the new display settings.

Browse Source 
- WITH_SMOKE macro was not defined so some code was not compiled, though
it was still accessible from the UI
- some UI elements were disappearing due to bad indentation, also rework
the UI code to not hide but rather disable/grey out button in the UI
- Display thickness was not used due to bad manual merge of the code
from the patch.
This commit is contained in:
Kévin Dietrich
2016-09-25 17:02:46 +02:00
parent 335ee5ce5a
commit ae69986b70
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
release/scripts/startup/bl_ui/properties_physics_smoke.py
View File

@@ -373,23 +373,26 @@ class PHYSICS_PT_smoke_display_settings(PhysicButtonsPanel, Panel):
slice_method = domain.slice_method
axis_slice_method = domain.axis_slice_method
if slice_method == 'AXIS_ALIGNED':
layout.prop(domain, "axis_slice_method")
row = layout.row();
row.enabled = (slice_method == 'AXIS_ALIGNED')
row.prop(domain, "axis_slice_method")
if axis_slice_method == 'SINGLE':
layout.prop(domain, "slice_axis")
layout.prop(domain, "slice_depth")
col = layout.column();
col.enabled = (axis_slice_method == 'SINGLE')
col.prop(domain, "slice_axis")
col.prop(domain, "slice_depth")
if axis_slice_method == 'FULL':
layout.prop(domain, "slice_per_voxel")
row = layout.row();
row.enabled = (axis_slice_method == 'FULL')
row.prop(domain, "slice_per_voxel")
layout.separator()
layout.label(text="Debug:")
layout.prop(domain, "draw_velocity")
col = layout.column();
col.enabled = domain.draw_velocity
col.prop(domain, "vector_draw_type")
col.prop(domain, "vector_scale")
layout.separator()
layout.label(text="Debug:")
layout.prop(domain, "draw_velocity")
col = layout.column();
col.enabled = domain.draw_velocity
col.prop(domain, "vector_draw_type")
col.prop(domain, "vector_scale")
if __name__ == "__main__": # only for live edit.