From 7b6af843c2bdef9c9ab6d00100d93192a8e769c0 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 8 Jun 2018 12:16:37 +0200 Subject: Cleanup: getting rid of G.main. Sometimes one needs a *lot* of changes for a single G.main... :/ --- source/blender/editors/interface/interface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/interface/interface.c') diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 20ad6f00c5b..895190ab885 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -51,10 +51,11 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_unit.h" +#include "BKE_idprop.h" +#include "BKE_main.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_idprop.h" +#include "BKE_unit.h" #include "BIF_gl.h" @@ -4735,10 +4736,10 @@ void UI_init(void) } /* after reading userdef file */ -void UI_init_userdef(void) +void UI_init_userdef(Main *bmain) { /* fix saved themes */ - init_userdef_do_versions(); + init_userdef_do_versions(bmain); uiStyleInit(); } -- cgit v1.2.3