Compile fix
authorDaniel Salazar <zanqdo@gmail.com>
Thu, 11 Feb 2010 17:27:43 +0000 (17:27 +0000)
committerDaniel Salazar <zanqdo@gmail.com>
Thu, 11 Feb 2010 17:27:43 +0000 (17:27 +0000)
release/scripts/ui/space_userpref.py
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c

index faa64a898772217fc2a6955286fe5630f20f6419..142252129c4bb3052d0d3be621bcf4990829bb42 100644 (file)
@@ -950,8 +950,8 @@ class USERPREF_PT_theme(bpy.types.Panel):
             prefs = theme.console
 
             col = split.column()
-            col.prop(prefs, "header")
             col.prop(prefs, "background")
+            col.prop(prefs, "header")
 
             col = split.column()
             col.prop(prefs, "line_output")
index 02d8ae43d4fc845fc5bf81d5a69bd96fa702aa72..89b994056771d71d44e045baa80b4f42ab11d58c 100644 (file)
@@ -353,8 +353,6 @@ char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
                                cp= ts->console_info; break;
                        case TH_CONSOLE_ERROR:
                                cp= ts->console_error; break;
-                       case TH_BACK:
-                               cp= ts->console_back; break;
 
                        case TH_HANDLE_VERTEX:
                                cp= ts->handle_vertex;
@@ -619,11 +617,11 @@ void ui_theme_init_userdef(void)
        
        /* space console */
        btheme->tconsole= btheme->tv3d;
+       SETCOL(btheme->tconsole.back, 0, 0, 0, 255);
        SETCOL(btheme->tconsole.console_output, 96, 128, 255, 255);
        SETCOL(btheme->tconsole.console_input, 255, 255, 255, 255);
        SETCOL(btheme->tconsole.console_info, 0, 170, 0, 255);
        SETCOL(btheme->tconsole.console_error, 220, 96, 96, 255);
-       SETCOL(btheme->tconsole.console_back, 0, 0, 0, 255);
        
 
        /* space sound */
index 12ca52e7f4b7dd3b5e6b8c599755e8f96c5ff4fa..3b39f062fad83ea5df1505d9178dbe72f0b0ce83 100644 (file)
@@ -202,10 +202,10 @@ typedef struct ThemeSpace {
        char cframe[4];
        char ds_channel[4], ds_subchannel[4]; // dopesheet
        
-       char console_output[4], console_input[4], console_info[4], console_error[4], console_back[4];
+       char console_output[4], console_input[4], console_info[4], console_error[4];
        
        char vertex_size, facedot_size;
-       char bpad[2];
+       char bpad[6];
 
        char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes
        char syntaxv[4], syntaxc[4];
index 64d4465c7e7b4286766c9e6c514c02c51502d2a8..e14da34488943db0ad2941e8083e46beafa3d234 100644 (file)
@@ -989,9 +989,9 @@ static void rna_def_userdef_theme_space_console(BlenderRNA *brna)
        RNA_def_property_update(prop, 0, "rna_userdef_update");
 
        prop= RNA_def_property(srna, "background", PROP_FLOAT, PROP_COLOR);
-       RNA_def_property_float_sdna(prop, NULL, "console_back");
+       RNA_def_property_float_sdna(prop, NULL, "back");
        RNA_def_property_array(prop, 3);
-       RNA_def_property_ui_text(prop, "Background", "");
+       RNA_def_property_ui_text(prop, "Window Background", "");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
 }