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/space_view3d/view3d_intern.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_view3d/view3d_intern.h') diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index dc268479736..cfcded70fc9 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -144,10 +144,10 @@ void draw_motion_paths_cleanup(View3D *v3d); /* drawobject.c */ void draw_object( - Scene *scene, struct ARegion *ar, View3D *v3d, + struct Main *bmain, Scene *scene, struct ARegion *ar, View3D *v3d, Base *base, const short dflag); void draw_object_select( - Scene *scene, ARegion *ar, View3D *v3d, + struct Main *bmain, Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short dflag); bool draw_glsl_material(Scene *scene, struct Object *ob, View3D *v3d, const char dt); @@ -203,7 +203,7 @@ void draw_sim_debug_data(Scene *scene, View3D *v3d, ARegion *ar); void view3d_main_region_draw(const struct bContext *C, struct ARegion *ar); void ED_view3d_draw_depth( - Scene *scene, + struct Main *bmain, struct Scene *scene, struct ARegion *ar, View3D *v3d, bool alphaoverride); void ED_view3d_draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d); void ED_view3d_draw_select_loop( -- cgit v1.2.3