[Bf-blender-cvs] [e856eb7e8b6] blender2.8: UI: don't change the theme area when setting theme

Campbell Barton noreply at git.blender.org
Tue Jul 3 05:58:21 CEST 2018


Commit: e856eb7e8b65a7391c89b0938de49bb7d781f5dc
Author: Campbell Barton
Date:   Tue Jul 3 05:57:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe856eb7e8b65a7391c89b0938de49bb7d781f5dc

UI: don't change the theme area when setting theme

===================================================================

M	source/blender/editors/interface/resources.c

===================================================================

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index fb4d6e0ea14..d1d069be595 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -755,7 +755,9 @@ void ui_theme_init_default(void)
 
 	UI_SetTheme(0, 0);  /* make sure the global used in this file is set */
 
+	const int active_theme_area = btheme->active_theme_area;
 	memcpy(btheme, &U_theme_default, sizeof(*btheme));
+	btheme->active_theme_area = active_theme_area;
 }
 
 void ui_style_init_default(void)



More information about the Bf-blender-cvs mailing list