diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2016-10-04 20:13:12 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2016-10-04 20:13:12 +0300 |
| commit | 487284db94f9c82f26915efd8b12cefe2429221a (patch) | |
| tree | 7f43f95ec22016faa35f10f0517108849d6bad7d /source/blender/editors/interface | |
| parent | 4f69557528893f8d52cac16f77bac70161aac3e1 (diff) | |
| parent | b7046b42ab509c9f0c0928a77435eb9ffd79d3ef (diff) | |
Merge branch 'master' into soc-2016-multiview
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 9544a35affc..b2bfd3db023 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1051,10 +1051,8 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tfile.text, 250, 250, 250, 255); rgba_char_args_set(btheme->tfile.text_hi, 15, 15, 15, 255); // rgba_char_args_set(btheme->tfile.panel, 145, 145, 145, 255); /* bookmark/ui regions */ - rgba_char_args_set(btheme->tfile.active, 130, 130, 130, 255); /* selected files */ rgba_char_args_set(btheme->tfile.hilite, 255, 140, 25, 255); /* selected files */ - - rgba_char_args_set(btheme->tfile.grid, 250, 250, 250, 255); + rgba_char_args_set(btheme->tfile.image, 250, 250, 250, 255); rgba_char_args_set(btheme->tfile.movie, 250, 250, 250, 255); rgba_char_args_set(btheme->tfile.scene, 250, 250, 250, 255); |