archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Compile fix

Browse Source
This commit is contained in:
Daniel Salazar
2010-02-11 17:27:43 +00:00
parent 08d3741980
commit 9f3563fa94
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/ui/space_userpref.py
View 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")

4
source/blender/editors/interface/resources.c
View 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 */

4
source/blender/makesdna/DNA_userdef_types.h
View 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];

4
source/blender/makesrna/intern/rna_userdef.c
View 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");
}