Cleanup: getting rid of G.main.

Sometimes one needs a *lot* of changes for a single G.main... :/

4 files changed, 10 insertions, 9 deletions

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();
 }
 
diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c
index b2ba7594fcb..8e2ca2e2b3a 100644
--- a/source/blender/editors/interface/interface_eyedropper_depth.c
+++ b/source/blender/editors/interface/interface_eyedropper_depth.c
@@ -41,6 +41,7 @@
 #include "BLI_math_vector.h"
 
 #include "BKE_context.h"
+#include "BKE_main.h"
 #include "BKE_screen.h"
 #include "BKE_unit.h"
 
@@ -151,6 +152,7 @@ static void depthdropper_exit(bContext *C, wmOperator *op)
 static void depthdropper_depth_sample_pt(bContext *C, DepthDropper *ddr, int mx, int my, float *r_depth)
 {
 	/* we could use some clever */
+	Main *bmain = CTX_data_main(C);
 	wmWindow *win = CTX_wm_window(C);
 	ScrArea *sa = BKE_screen_find_area_xy(win->screen, SPACE_TYPE_ANY, mx, my);
 	Scene *scene = win->screen->scene;
@@ -183,7 +185,7 @@ static void depthdropper_depth_sample_pt(bContext *C, DepthDropper *ddr, int mx,
 
 				view3d_operator_needs_opengl(C);
 
-				if (ED_view3d_autodist(scene, ar, v3d, mval, co, true, NULL)) {
+				if (ED_view3d_autodist(bmain, scene, ar, v3d, mval, co, true, NULL)) {
 					const float mval_center_fl[2] = {
 					    (float)ar->winx / 2,
 					    (float)ar->winy / 2};
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 9ae245fee21..c1adaf4c764 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -726,7 +726,7 @@ void ui_icon_ensure_deferred(const struct bContext *C, const int icon_id, const
 int ui_id_icon_get(const struct bContext *C, struct ID *id, const bool big);
 
 /* resources.c */
-void init_userdef_do_versions(void);
+void init_userdef_do_versions(struct Main *bmain);
 void ui_theme_init_default(void);
 void ui_style_init_default(void);
 void ui_resources_init(void);
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 3477a66d600..4864133c905 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1631,10 +1631,8 @@ void UI_make_axis_color(const unsigned char src_col[3], unsigned char dst_col[3]
 /* ************************************************************* */
 
 /* patching UserDef struct and Themes */
-void init_userdef_do_versions(void)
+void init_userdef_do_versions(Main *bmain)
 {
-	Main *bmain = G.main;
-
 #define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(bmain, ver, subver)
 
 	/* the UserDef struct is not corrected with do_versions() .... ugh! */