diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-20 00:22:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-06 21:27:39 +0300 |
| commit | 02f3cebf6e4cc13f58b5198988672e99b8aac6fc (patch) | |
| tree | f24b15d39ed1260f40f39b7e7c0376dd21d592f7 /release | |
| parent | e77e018d48ab99dbe843a79d72bc9d79e5ae8163 (diff) | |
Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script
(if they're on different properties).
This patch basically gets rid of (ui-related) hack where we was adding specific
'fake' enums for datatypes needing additional options.
That was done because of broken UI code - to summarize, 'align' code did not support
correctly layout mixing vertical and horizontal sub-layouts, in particular if
it was 'column-major'.
A complete rewrite of this align code has been done, so now we can use a more
sane UI code.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index de8617ecc52..f0040c9c5ba 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -1276,14 +1276,14 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col = layout.column(align=True) split = col.split(0.333, align=True) sub = split.column(align=True) - sub.prop(md, "data_types_verts_vgroup") - row = split.row(align=True) + sub.prop(md, "data_types_verts") + sub = split.column(align=True) + row = sub.row(align=True) row.prop(md, "layers_vgroup_select_src", text="") - row.label(icon='RIGHTARROW_THIN') + row.label(icon='RIGHTARROW') row.prop(md, "layers_vgroup_select_dst", text="") - split = col.split(0.333, align=True) - sub = split.column(align=True) - sub.prop(md, "data_types_verts") + row = sub.row(align=True) + row.label("", icon='NONE') layout.separator() @@ -1312,17 +1312,14 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): split = col.split(0.333, align=True) sub = split.column(align=True) sub.prop(md, "data_types_loops") - split = col.split(0.333, align=True) sub = split.column(align=True) - sub.prop(md, "data_types_loops_vcol") - row = split.row(align=True) + row = sub.row(align=True) + row.label("", icon='NONE') + row = sub.row(align=True) row.prop(md, "layers_vcol_select_src", text="") row.label(icon='RIGHTARROW') row.prop(md, "layers_vcol_select_dst", text="") - split = col.split(0.333, align=True) - sub = split.column(align=True) - sub.prop(md, "data_types_loops_uv") - row = split.row(align=True) + row = sub.row(align=True) row.prop(md, "layers_uv_select_src", text="") row.label(icon='RIGHTARROW') row.prop(md, "layers_uv_select_dst", text="") |