diff options
| author | Daniel Salazar <zanqdo@gmail.com> | 2010-02-11 20:27:43 +0300 |
|---|---|---|
| committer | Daniel Salazar <zanqdo@gmail.com> | 2010-02-11 20:27:43 +0300 |
| commit | 9f3563fa94fb6696987f0db0b703e2c9cc206fd1 (patch) | |
| tree | 99e450d55e90435959f594fb505c9a30210aa11c /source | |
| parent | 08d37419805aa1fe7e8041f09e3026a160c8730b (diff) | |
Compile fix
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 02d8ae43d4f..89b99405677 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -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 */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 12ca52e7f4b..3b39f062fad 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -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]; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 64d4465c7e7..e14da344889 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -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"); } |