Merge branch 'blender2.8' of git.blender.org:blender into blender2.8

intern/cycles/blender/addon/ui.py

@@ -1307,10 +1307,6 @@ class CYCLES_MATERIAL_PT_viewport(CyclesButtonsPanel, Panel):
         col.prop(mat, "diffuse_color", text="")
         col.prop(mat, "alpha")
 
-        col.separator()
-        col.label("Alpha:")
-        col.prop(mat.game_settings, "alpha_blend", text="")
-
         col = split.column(align=True)
         col.label("Specular:")
         col.prop(mat, "specular_color", text="")

release/scripts/startup/bl_ui/space_userpref.py

@@ -520,7 +520,6 @@ class USERPREF_PT_system(Panel):
         col = colsplit.column()
         col.label(text="OpenGL:")
         col.prop(system, "gl_clip_alpha", slider=True)
-        col.prop(system, "use_mipmaps")
         col.prop(system, "use_gpu_mipmap")
         col.prop(system, "use_16bit_textures")