From e927f8b424efabfc19605854c0e5d5d9348da3c6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 9 Feb 2016 19:44:15 +0100 Subject: Fix T47370: untranslateable bake panel strings. Reorder buttons a bit so that these strings are not even needed, makes more sense to have this grouped anyway. --- intern/cycles/blender/addon/ui.py | 55 ++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 32 deletions(-) (limited to 'intern') diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 9fb0acdb30e..610833be27e 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1441,29 +1441,10 @@ class CyclesRender_PT_bake(CyclesButtonsPanel, Panel): col = layout.column() col.prop(cscene, "bake_type") - col.separator() - - split = layout.split() - col = split.column() - col.prop(cbk, "margin") - col.prop(cbk, "use_clear") - - col = split.column() - col.prop(cbk, "use_selected_to_active") - sub = col.column() - sub.active = cbk.use_selected_to_active - sub.prop(cbk, "use_cage", text="Cage") - if cbk.use_cage: - sub.prop(cbk, "cage_extrusion", text="Extrusion") - sub.prop_search(cbk, "cage_object", scene, "objects", text="") - else: - sub.prop(cbk, "cage_extrusion", text="Ray Distance") + col = layout.column() if cscene.bake_type == 'NORMAL': - layout.separator() - col = layout.column() - col.label(text="Normal Settings:") col.prop(cbk, "normal_space", text="Space") row = col.row(align=True) @@ -1473,13 +1454,6 @@ class CyclesRender_PT_bake(CyclesButtonsPanel, Panel): row.prop(cbk, "normal_b", text="") elif cscene.bake_type == 'COMBINED': - col = layout.column() - col.label(text="Combined Settings:") - - row = col.row() - row.prop(cbk, "use_pass_ambient_occlusion") - row.prop(cbk, "use_pass_emit") - row = col.row(align=True) row.prop(cbk, "use_pass_direct", toggle=True) row.prop(cbk, "use_pass_indirect", toggle=True) @@ -1490,21 +1464,38 @@ class CyclesRender_PT_bake(CyclesButtonsPanel, Panel): col = split.column() col.prop(cbk, "use_pass_diffuse") col.prop(cbk, "use_pass_glossy") + col.prop(cbk, "use_pass_transmission") col = split.column() - col.prop(cbk, "use_pass_transmission") col.prop(cbk, "use_pass_subsurface") + col.prop(cbk, "use_pass_ambient_occlusion") + col.prop(cbk, "use_pass_emit") elif cscene.bake_type in {'DIFFUSE', 'GLOSSY', 'TRANSMISSION', 'SUBSURFACE'}: - layout.separator() - col = layout.column() - col.label(text="{0} Settings:".format(cscene.bake_type.title())) - row = col.row(align=True) row.prop(cbk, "use_pass_direct", toggle=True) row.prop(cbk, "use_pass_indirect", toggle=True) row.prop(cbk, "use_pass_color", toggle=True) + layout.separator() + + split = layout.split() + + col = split.column() + col.prop(cbk, "margin") + col.prop(cbk, "use_clear") + + col = split.column() + col.prop(cbk, "use_selected_to_active") + sub = col.column() + sub.active = cbk.use_selected_to_active + sub.prop(cbk, "use_cage", text="Cage") + if cbk.use_cage: + sub.prop(cbk, "cage_extrusion", text="Extrusion") + sub.prop_search(cbk, "cage_object", scene, "objects", text="") + else: + sub.prop(cbk, "cage_extrusion", text="Ray Distance") + class CyclesRender_PT_debug(CyclesButtonsPanel, Panel): bl_label = "Debug" -- cgit v1.2.3