Merged changes in the trunk up to revision 43748.
[blender.git] / source / blender / editors / interface / resources.c
index 472e2088d4323f8a37d3632adb874a57daa57cbf..daaca41393b0bcc426131f4e90aa67f858f202d6 100644 (file)
@@ -456,6 +456,14 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
                                cp= ts->camera_path; break;
                        case TH_LOCK_MARKER:
                                cp= ts->lock_marker; break;
+                       
+                       case TH_MATCH:
+                               cp= ts->match;
+                               break;
+                               
+                       case TH_SELECT_HIGHLIGHT:
+                               cp= ts->selected_highlight;
+                               break;
                        }
                }
        }
@@ -798,6 +806,9 @@ void ui_theme_init_default(void)
        btheme->toops= btheme->tv3d;
        SETCOLF(btheme->toops.back,     0.45, 0.45, 0.45, 1.0);
        
+       SETCOLF(btheme->toops.match,    0.2, 0.5, 0.2, 0.3);    /* highlighting search match - soft green*/
+       SETCOLF(btheme->toops.selected_highlight, 0.51, 0.53, 0.55, 0.3);
+
        /* space info */
        btheme->tinfo= btheme->tv3d;
        SETCOLF(btheme->tinfo.back,     0.45, 0.45, 0.45, 1.0);
@@ -1702,17 +1713,17 @@ void init_userdef_do_versions(void)
                        BLI_addtail(&U.addons, baddon);
                }
        }
-
+       
        if (bmain->versionfile < 260 || (bmain->versionfile == 260 && bmain->subversionfile < 5)) {
                bTheme *btheme;
-
+               
                for(btheme= U.themes.first; btheme; btheme= btheme->next) {
                        SETCOL(btheme->tui.panel.header, 0, 0, 0, 25);
                        btheme->tui.icon_alpha= 1.0;
                }
        }
-
-       if (bmain->versionfile < 262){
+       
+       if (bmain->versionfile < 261 || (bmain->versionfile == 261 && bmain->subversionfile < 4)) {
                bTheme *btheme;
                for(btheme= U.themes.first; btheme; btheme= btheme->next) {
                        SETCOLF(btheme->tima.preview_stitch_face, 0.071, 0.259, 0.694, 0.150);
@@ -1721,10 +1732,14 @@ void init_userdef_do_versions(void)
                        SETCOLF(btheme->tima.preview_stitch_stitchable, 0.0, 1.0, 0.0, 1.0);
                        SETCOLF(btheme->tima.preview_stitch_unstitchable, 1.0, 0.0, 0.0, 1.0);
                        SETCOLF(btheme->tima.preview_stitch_active, 0.886, 0.824, 0.765, 0.140);
+                       
+                       SETCOLF(btheme->toops.match, 0.2, 0.5, 0.2, 0.3);
+                       SETCOLF(btheme->toops.selected_highlight, 0.51, 0.53, 0.55, 0.3);
                }
-               U.use_16bit_textures = 0;
+               
+               U.use_16bit_textures = 1;
        }
-       
+
        /* Freestyle color settings */
        {
                bTheme *btheme;