forked from bartvdbraak/blender
remove USER_DISABLE_AA/use_antialiasing, this wasn't available from the UI but would be confusing if someone had it set from an old file.
This commit is contained in:
parent
89f4566930
commit
7c004d2892
@ -442,8 +442,6 @@ class USERPREF_PT_system(Panel):
|
||||
col.label(text="Anisotropic Filtering")
|
||||
col.prop(system, "anisotropic_filter", text="")
|
||||
col.prop(system, "use_vertex_buffer_objects")
|
||||
# Anti-aliasing is disabled as it breaks border/lasso select
|
||||
#~ col.prop(system, "use_antialiasing")
|
||||
col.label(text="Window Draw Method:")
|
||||
col.prop(system, "window_draw_method", text="")
|
||||
col.prop(system, "multi_sample", text="")
|
||||
|
@ -2996,9 +2996,10 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
|
||||
v3d->zbuf = FALSE;
|
||||
|
||||
/* enables anti-aliasing for 3D view drawing */
|
||||
if (U.ogl_multisamples)
|
||||
if (!(U.gameflags & USER_DISABLE_AA))
|
||||
if (U.ogl_multisamples != USER_MULTISAMPLE_NONE) {
|
||||
// if (!(U.gameflags & USER_DISABLE_AA))
|
||||
glEnable(GL_MULTISAMPLE_ARB);
|
||||
}
|
||||
|
||||
|
||||
/* needs to be done always, gridview is adjusted in drawgrid() now */
|
||||
@ -3113,9 +3114,10 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
|
||||
BIF_draw_manipulator(C);
|
||||
|
||||
/* Disable back anti-aliasing */
|
||||
if (U.ogl_multisamples)
|
||||
if (!(U.gameflags & USER_DISABLE_AA))
|
||||
if (U.ogl_multisamples != USER_MULTISAMPLE_NONE) {
|
||||
// if (!(U.gameflags & USER_DISABLE_AA))
|
||||
glDisable(GL_MULTISAMPLE_ARB);
|
||||
}
|
||||
|
||||
|
||||
if (v3d->zbuf) {
|
||||
|
@ -600,7 +600,7 @@ typedef enum eOpenGL_RenderingOptions {
|
||||
/* backwards compatibilty in do_versions! */
|
||||
USER_DISABLE_MIPMAP = (1 << 2),
|
||||
USER_DISABLE_VBO = (1 << 3),
|
||||
USER_DISABLE_AA = (1 << 4),
|
||||
/* USER_DISABLE_AA = (1 << 4), */ /* DEPRECATED */
|
||||
} eOpenGL_RenderingOptions;
|
||||
|
||||
/* wm draw method */
|
||||
|
@ -3236,10 +3236,12 @@ static void rna_def_userdef_system(BlenderRNA *brna)
|
||||
/* this isn't essential but nice to check if VBO draws any differently */
|
||||
RNA_def_property_update(prop, NC_WINDOW, NULL);
|
||||
|
||||
#if 0
|
||||
prop = RNA_def_property(srna, "use_antialiasing", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_AA);
|
||||
RNA_def_property_ui_text(prop, "Anti-aliasing",
|
||||
"Use anti-aliasing for the 3D view (may impact redraw performance)");
|
||||
#endif
|
||||
|
||||
prop = RNA_def_property(srna, "anisotropic_filter", PROP_ENUM, PROP_NONE);
|
||||
RNA_def_property_enum_sdna(prop, NULL, "anisotropic_filter");
|
||||
|
Loading…
Reference in New Issue
Block a user