[Bf-blender-cvs] [90b2e4ce284] blender2.8: UI: move orientation to the topbar

Campbell Barton noreply at git.blender.org
Sat May 12 14:56:17 CEST 2018


Commit: 90b2e4ce284e77e5422f672ded258c139e35af10
Author: Campbell Barton
Date:   Sat May 12 14:54:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB90b2e4ce284e77e5422f672ded258c139e35af10

UI: move orientation to the topbar

Move manipulator toggle to overlay popover.

===================================================================

M	release/scripts/startup/bl_ui/space_topbar.py
M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/space_view3d/view3d_header.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 0b22d1baaee..9c98df00850 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -194,6 +194,10 @@ class TOPBAR_HT_lower_bar(Header):
         elif mode == 'PARTICLE':
             layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".particlemode", category="")
 
+        # 3D View Options, tsk. maybe users aren't always using 3D view?
+        scene = context.scene
+        layout.prop(scene, "transform_orientation", text="", icon='MANIPUL')
+
         # Command Settings (redo)
         op = context.active_operator
         row = layout.row()
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 7c32c39e740..3189a1c14b5 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3600,6 +3600,8 @@ class VIEW3D_PT_overlay(Panel):
         col.active = display_all
         col.prop(overlay, "show_cursor")
 
+        col.prop(view, "show_manipulator")
+
         col = layout.column()
         col.active = display_all
         col.prop(overlay, "show_outline_selected")
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 52a8562b6ba..7ae65f6db87 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -358,10 +358,13 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 
 	}
 	else {
+		/* Moved to popover and topbar. */
+#if 0
 		/* Transform widget / manipulators */
 		row = uiLayoutRow(layout, true);
 		uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 		uiItemR(row, &sceneptr, "transform_orientation", 0, "", ICON_NONE);
+#endif
 	}
 
 	if (obedit == NULL && v3d->localvd == NULL) {



More information about the Bf-blender-cvs mailing list