Merged changes in the trunk up to revision 47977.
[blender.git] / release / scripts / startup / bl_ui / space_view3d.py
index bcab691c2cdb2c87fb84b1f4fc6bb812fc76bb27..2b3df32aeafde251d4ce09fc75e08c858696d8cd 100644 (file)
@@ -2587,13 +2587,21 @@ class VIEW3D_PT_background_image(Panel):
 
                 if has_bg:
                     col = box.column()
-                    col.prop(bg, "show_on_foreground")
                     col.prop(bg, "opacity", slider=True)
+
+                    rowsub = col.row()
+                    rowsub.prop(bg, "draw_depth", expand=True)
+
+                    if bg.view_axis in {'CAMERA', 'ALL'}:
+                        rowsub = col.row()
+                        rowsub.prop(bg, "frame_method", expand=True)
+
+                    row = col.row(align=True)
+                    row.prop(bg, "offset_x", text="X")
+                    row.prop(bg, "offset_y", text="Y")
+
                     if bg.view_axis != 'CAMERA':
                         col.prop(bg, "size")
-                        row = col.row(align=True)
-                        row.prop(bg, "offset_x", text="X")
-                        row.prop(bg, "offset_y", text="Y")
 
 
 class VIEW3D_PT_transform_orientations(Panel):