[Bf-blender-cvs] [d91078bb6e5] modifier-panels-ui: Merge branch 'master' into modifier-panels-ui

[Hans Goudey]

Commit: d91078bb6e5ba9b2481aa030e296c100336a36a0
Author: Hans Goudey
Date:   Wed Apr 15 13:19:03 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBd91078bb6e5ba9b2481aa030e296c100336a36a0

Merge branch 'master' into modifier-panels-ui

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



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

diff --cc release/scripts/startup/bl_ui/properties_data_empty.py
index 51b566321b3,898ab2e4359..12ac8396493
--- a/release/scripts/startup/bl_ui/properties_data_empty.py
+++ b/release/scripts/startup/bl_ui/properties_data_empty.py
@@@ -49,13 -49,13 +49,15 @@@ class DATA_PT_empty(DataButtonsPanel, P
              col.prop(ob, "empty_image_offset", text="Y", index=1)
  
              col = layout.column()
-             col.row().prop(ob, "empty_image_depth", text="Depth", expand=True)
+             depth_row = col.row()
+             depth_row.enabled = not ob.show_in_front
+             depth_row.prop(ob, "empty_image_depth", text="Depth", expand=True)
              col.row().prop(ob, "empty_image_side", text="Side", expand=True)
 -            col.prop(ob, "show_empty_image_orthographic", text="Display Orthographic")
 -            col.prop(ob, "show_empty_image_perspective", text="Display Perspective")
 -            col.prop(ob, "show_empty_image_only_axis_aligned")
 +
 +            col = layout.column(heading = "Show in", align = True)
 +            col.prop(ob, "show_empty_image_orthographic", text="Orthographic")
 +            col.prop(ob, "show_empty_image_perspective", text="Perspective")
 +            col.prop(ob, "show_empty_image_only_axis_aligned", text="Only Axis Aligned")
  
  
  class DATA_PT_empty_alpha(DataButtonsPanel, Panel):
diff --cc source/blender/editors/interface/interface_panel.c
index 1bf05c8d0f2,b8f87a4300c..e0e42df9481
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@@ -984,15 -742,9 +984,15 @@@ void ui_draw_aligned_panel(uiStyle *sty
    /* an open panel */
    else {
      /* in some occasions, draw a border */
-     if (panel->flag & PNL_SELECT) {
+     if (panel->flag & PNL_SELECT && !is_subpanel) {
 +      float radius;
        if (panel->control & UI_PNL_SOLID) {
          UI_draw_roundbox_corner_set(UI_CNR_ALL);
 +        radius = 8.0f;
 +      }
 +      else if (is_list_panel) {
 +        UI_draw_roundbox_corner_set(UI_CNR_ALL);
 +        radius = UI_LIST_PANEL_ROUNDNESS;
        }
        else {
          UI_draw_roundbox_corner_set(UI_CNR_NONE);