add support for storing text styles in themes.

also reset text styles when resetting to the default theme. 

3 files changed, 9 insertions, 0 deletions

diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 4b2fb102305..5621aa2d0cc 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -560,6 +560,7 @@ int ui_id_icon_get(struct bContext *C, struct ID *id, const bool big);
 /* resources.c */
 void init_userdef_do_versions(void);
 void ui_theme_init_default(void);
+void ui_style_init_default(void);
 void ui_resources_init(void);
 void ui_resources_free(void);
 
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index f5758711ad2..9f7d1435195 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -351,6 +351,7 @@ static void UI_OT_eyedropper(wmOperatorType *ot)
 static int reset_default_theme_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	ui_theme_init_default();
+	ui_style_init_default();
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 	
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index e43b4925fbd..283cafcc706 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1001,6 +1001,13 @@ void ui_theme_init_default(void)
 	btheme->tclip.handle_vertex_size = 4;
 }
 
+void ui_style_init_default(void)
+{
+	BLI_freelistN(&U.uistyles);
+	/* gets automatically re-allocated */
+	uiStyleInit();
+}
+
 
 void UI_SetTheme(int spacetype, int regionid)
 {