Merged changes in the trunk up to revision 54802.
[blender.git] / source / blender / editors / interface / resources.c
index 009d52ea283c540f4b2f13f0896a5bb695135f4a..acea6e133f46bb563f3b10e9d8c9a8d96cdbd7fd 100644 (file)
@@ -433,6 +433,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
                                        cp = ts->console_error; break;
                                case TH_CONSOLE_CURSOR:
                                        cp = ts->console_cursor; break;
+                               case TH_CONSOLE_SELECT:
+                                       cp = ts->console_select; break;
 
                                case TH_HANDLE_VERTEX:
                                        cp = ts->handle_vertex;
@@ -947,6 +949,7 @@ void ui_theme_init_default(void)
        rgba_char_args_set(btheme->tconsole.console_info, 0, 170, 0, 255);
        rgba_char_args_set(btheme->tconsole.console_error, 220, 96, 96, 255);
        rgba_char_args_set(btheme->tconsole.console_cursor, 220, 96, 96, 255);
+       rgba_char_args_set(btheme->tconsole.console_select, 255, 255, 255, 48);
        
        /* space time */
        btheme->ttime = btheme->tv3d;
@@ -2160,6 +2163,13 @@ void init_userdef_do_versions(void)
                }
        }
 
+       if (U.versionfile < 265 || (U.versionfile == 265 && U.subversionfile < 11)) {
+               bTheme *btheme;
+               for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+                       rgba_char_args_test_set(btheme->tconsole.console_select, 255, 255, 255, 48);
+               }
+       }
+
        /* NOTE!! from now on use U.versionfile and U.subversionfile */