Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-04-19 11:42:03 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-04-19 11:42:03 +0300
commita8db1efbcf1513f7bb912c98ea9c1b7d3b333727 (patch)
tree08328a560a5ebb878882953e1e704c7141d7546d /release
parent3a4a5ed378d304d3b2ba272201df06eef7c945f9 (diff)
parent1802c6e4a14256f441b46c50bd582f91591078ee (diff)
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 3449280f862..953ebba54ca 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/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")