[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26810] trunk/blender: Compile fix

[Daniel Salazar]

Revision: 26810
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26810
Author:   zanqdo
Date:     2010-02-11 18:27:43 +0100 (Thu, 11 Feb 2010)

Log Message:
-----------
Compile fix

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-02-11 16:54:25 UTC (rev 26809)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-02-11 17:27:43 UTC (rev 26810)
@@ -950,8 +950,8 @@
             prefs = theme.console
 
             col = split.column()
+            col.prop(prefs, "background")
             col.prop(prefs, "header")
-            col.prop(prefs, "background")
 
             col = split.column()
             col.prop(prefs, "line_output")

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2010-02-11 16:54:25 UTC (rev 26809)
+++ trunk/blender/source/blender/editors/interface/resources.c	2010-02-11 17:27:43 UTC (rev 26810)
@@ -353,8 +353,6 @@
 				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 @@
 	
 	/* 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 */

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-02-11 16:54:25 UTC (rev 26809)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-02-11 17:27:43 UTC (rev 26810)
@@ -202,10 +202,10 @@
 	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];

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-02-11 16:54:25 UTC (rev 26809)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-02-11 17:27:43 UTC (rev 26810)
@@ -989,9 +989,9 @@
 	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");
 }