Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / editors / interface / resources.c
index c54e09b..5b51d89 100644 (file)
@@ -445,7 +445,6 @@ void ui_theme_init_userdef(void)
        SETCOL(btheme->tv3d.text_hi, 255, 255, 255, 255);
        
        SETCOLF(btheme->tv3d.header,    0.45, 0.45, 0.45, 1.0);
-       SETCOLF(btheme->tv3d.button,    0.45, 0.45, 0.45, 1.0);
        SETCOL(btheme->tv3d.panel,      165, 165, 165, 127);
        
        SETCOL(btheme->tv3d.shade1,  160, 160, 160, 100);
@@ -1245,18 +1244,6 @@ void init_userdef_do_versions(void)
                        SETCOLF(btheme->tuserpref.back, 0.45, 0.45, 0.45, 1.0);
                }
        }
-
-       if (G.main->versionfile < 250 || (G.main->versionfile == 250 && G.main->subversionfile < 3)) {
-               /* new audio system */
-               if(U.audiochannels == 0)
-                       U.audiochannels = 2;
-               if(U.audiodevice == 0)
-                       U.audiodevice = 2;
-               if(U.audioformat == 0)
-                       U.audioformat = 0x24;
-               if(U.audiorate == 0)
-                       U.audiorate = 44100;
-       }
        
        /* GL Texture Garbage Collection (variable abused above!) */
        if (U.textimeout == 0) {