[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45114] trunk/blender/source/blender: Sequence Editor Themes:
Thomas Dinges
blender at dingto.org
Fri Mar 23 21:50:51 CET 2012
Revision: 45114
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45114
Author: dingto
Date: 2012-03-23 20:50:38 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Sequence Editor Themes:
* Preview Background is now themeable. Patch by Pablo Vazquez (venomgfx).
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_resources.h 2012-03-23 20:18:09 UTC (rev 45113)
+++ trunk/blender/source/blender/editors/include/UI_resources.h 2012-03-23 20:50:38 UTC (rev 45114)
@@ -158,6 +158,7 @@
TH_SEQ_PLUGIN,
TH_SEQ_TRANSITION,
TH_SEQ_META,
+ TH_SEQ_PREVIEW,
TH_EDGE_SHARP,
TH_EDITMESH_ACTIVE,
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2012-03-23 20:18:09 UTC (rev 45113)
+++ trunk/blender/source/blender/editors/interface/resources.c 2012-03-23 20:50:38 UTC (rev 45114)
@@ -384,6 +384,8 @@
cp= ts->transition; break;
case TH_SEQ_META:
cp= ts->meta; break;
+ case TH_SEQ_PREVIEW:
+ cp= ts->preview_back; break;
case TH_CONSOLE_OUTPUT:
cp= ts->console_output; break;
@@ -770,7 +772,7 @@
rgba_char_args_set(btheme->tseq.plugin, 126, 126, 80, 255);
rgba_char_args_set(btheme->tseq.transition, 162, 95, 111, 255);
rgba_char_args_set(btheme->tseq.meta, 109, 145, 131, 255);
-
+ rgba_char_args_set(btheme->tseq.preview_back, 0, 0, 0, 255);
/* space image */
btheme->tima= btheme->tv3d;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2012-03-23 20:18:09 UTC (rev 45113)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2012-03-23 20:50:38 UTC (rev 45114)
@@ -778,6 +778,7 @@
float viewrectx, viewrecty;
float render_size = 0.0;
float proxy_size = 100.0;
+ float col[3];
GLuint texid;
GLuint last_texid;
SeqRenderData context;
@@ -805,8 +806,8 @@
}
if(frame_ofs == 0) {
- /* XXX TODO: take color from theme */
- glClearColor(0.0, 0.0, 0.0, 0.0);
+ UI_GetThemeColor3fv(TH_SEQ_PREVIEW, col);
+ glClearColor(col[0], col[1], col[2], 0.0);
glClear(GL_COLOR_BUFFER_BIT);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-03-23 20:18:09 UTC (rev 45113)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-03-23 20:50:38 UTC (rev 45114)
@@ -1799,6 +1799,12 @@
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Draw Action", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+ prop = RNA_def_property(srna, "preview_back", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, NULL, "preview_back");
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Preview Background", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_update");
}
static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list