[Bf-blender-cvs] [a875e816740] master: UI: Tweaks to Compositor header
William Reynish
noreply at git.blender.org
Fri May 24 14:46:39 CEST 2019
Commit: a875e8167403ff4cf9ae5c5a120e16afec7b8368
Author: William Reynish
Date: Fri May 24 14:46:37 2019 +0200
Branches: master
https://developer.blender.org/rBa875e8167403ff4cf9ae5c5a120e16afec7b8368
UI: Tweaks to Compositor header
- Move Auto Render into Options panel in sidebar
- Move Pin to the right and remove emboss
- Move Background to the right and use greying out to avoid jumping UI elements
Also remove emboss from pin toggle in Image Editor for consistency
===================================================================
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_node.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 88350920772..48ca0b89016 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -706,7 +706,7 @@ class IMAGE_HT_header(Header):
row.template_ID(sima, "mask", new="mask.new")
if not show_render:
- layout.prop(sima, "use_image_pin", text="")
+ layout.prop(sima, "use_image_pin", text="", emboss=False)
layout.separator_spacer()
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index ae1cd78e522..13d66dc851a 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -150,12 +150,6 @@ class NODE_HT_header(Header):
if snode_id:
layout.prop(snode_id, "use_nodes")
- layout.prop(snode, "use_auto_render")
- layout.prop(snode, "show_backdrop")
- if snode.show_backdrop:
- row = layout.row(align=True)
- row.prop(snode, "backdrop_channels", text="", expand=True)
-
else:
# Custom node tree is edited as independent ID block
NODE_MT_editor_menus.draw_collapsible(context, layout)
@@ -164,13 +158,26 @@ class NODE_HT_header(Header):
layout.template_ID(snode, "node_tree", new="node.new_node_tree")
- layout.prop(snode, "pin", text="")
+ # Put pin next to ID block
+ if snode.tree_type != 'CompositorNodeTree':
+ layout.prop(snode, "pin", text="", emboss=False)
+
layout.separator_spacer()
- layout.template_running_jobs()
+ # Put pin on the right for Compositing
+ if snode.tree_type == 'CompositorNodeTree':
+ layout.prop(snode, "pin", text="", emboss=False)
layout.operator("node.tree_path_parent", text="", icon='FILE_PARENT')
+ # Backdrop
+ if snode.tree_type == 'CompositorNodeTree':
+ row=layout.row(align=True)
+ row.prop(snode, "show_backdrop", toggle=True)
+ sub=row.row(align=True)
+ sub.active = snode.show_backdrop
+ sub.prop(snode, "backdrop_channels", icon_only=True, text="", expand=True)
+
# Snap
row = layout.row(align=True)
row.prop(tool_settings, "use_snap", text="")
@@ -620,6 +627,8 @@ class NODE_PT_quality(bpy.types.Panel):
col.prop(tree, "use_groupnode_buffer")
col.prop(tree, "use_two_pass")
col.prop(tree, "use_viewer_border")
+ col.separator()
+ col.prop(snode, "use_auto_render")
class NODE_UL_interface_sockets(bpy.types.UIList):
More information about the Bf-blender-cvs
mailing list