[Bf-blender-cvs] [7a21b64c098] temp-checkbox-layout-tweaks: Merge branch 'temp-checkbox-layout-tweaks-patch' into temp-checkbox-layout-tweaks-apply

[Julian Eisel]

Commit: 7a21b64c098045a639e999392e9225ff3286d3e8
Author: Julian Eisel
Date:   Thu Apr 16 21:03:08 2020 +0200
Branches: temp-checkbox-layout-tweaks
https://developer.blender.org/rB7a21b64c098045a639e999392e9225ff3286d3e8

Merge branch 'temp-checkbox-layout-tweaks-patch' into temp-checkbox-layout-tweaks-apply

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



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

diff --cc release/scripts/startup/bl_ui/properties_data_empty.py
index cf7e401d36f,898ab2e4359..1523f69536f
--- 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):