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/curve/editcurve_paint.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/curve') diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index 964296df205..325c39d7f38 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -35,6 +35,7 @@ #include "BKE_curve.h" #include "BKE_depsgraph.h" #include "BKE_fcurve.h" +#include "BKE_main.h" #include "BKE_report.h" #include "WM_api.h" @@ -589,6 +590,7 @@ static bool curve_draw_init(bContext *C, wmOperator *op, bool is_invoke) } } else { + cdd->vc.bmain = CTX_data_main(C); cdd->vc.scene = CTX_data_scene(C); cdd->vc.obedit = CTX_data_edit_object(C); } @@ -1078,7 +1080,7 @@ static int curve_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event) /* needed or else the draw matrix can be incorrect */ view3d_operator_needs_opengl(C); - ED_view3d_autodist_init(cdd->vc.scene, cdd->vc.ar, cdd->vc.v3d, 0); + ED_view3d_autodist_init(cdd->vc.bmain, cdd->vc.scene, cdd->vc.ar, cdd->vc.v3d, 0); if (cdd->vc.rv3d->depths) { cdd->vc.rv3d->depths->damaged = true; -- cgit v1.2.3