[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52524] trunk/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 .

[Campbell Barton]

Revision: 52524
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52524
Author:   campbellbarton
Date:     2012-11-24 00:59:10 +0000 (Sat, 24 Nov 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2012-11-24 00:58:57 UTC (rev 52523)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2012-11-24 00:59:10 UTC (rev 52524)
@@ -442,8 +442,6 @@
         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="")

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-11-24 00:58:57 UTC (rev 52523)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-11-24 00:59:10 UTC (rev 52524)
@@ -2996,9 +2996,10 @@
 		v3d->zbuf = FALSE;
 
 	/* enables anti-aliasing for 3D view drawing */
-	if (U.ogl_multisamples)
-		if (!(U.gameflags & USER_DISABLE_AA))
-			glEnable(GL_MULTISAMPLE_ARB);
+	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 @@
 	BIF_draw_manipulator(C);
 
 	/* Disable back anti-aliasing */
-	if (U.ogl_multisamples)
-		if (!(U.gameflags & USER_DISABLE_AA))
-			glDisable(GL_MULTISAMPLE_ARB);
+	if (U.ogl_multisamples != USER_MULTISAMPLE_NONE) {
+		// if (!(U.gameflags & USER_DISABLE_AA))
+		glDisable(GL_MULTISAMPLE_ARB);
+	}
 
 	
 	if (v3d->zbuf) {

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2012-11-24 00:58:57 UTC (rev 52523)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2012-11-24 00:59:10 UTC (rev 52524)
@@ -600,7 +600,7 @@
 	                                     /* 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 */

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2012-11-24 00:58:57 UTC (rev 52523)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2012-11-24 00:59:10 UTC (rev 52524)
@@ -3236,10 +3236,12 @@
 	/* 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");