diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-20 10:15:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-20 10:15:06 +0300 |
commit | 44ca116ca2aec7651e1fdab9cba6f63c244a8f93 (patch) | |
tree | 36bd6f2e79734714919e108d26644023be384a83 | |
parent | 2a39f2595bfa5b7fdfd751fb4fa435047c2b60fa (diff) |
Cleanup: formatting, unused args
-rw-r--r-- | source/blender/draw/DRW_engine.h | 1 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw_legacy.c | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 5 |
5 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index d0b7c10a3cb..da1f5c7863a 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -133,7 +133,6 @@ void DRW_draw_depth_loop_gpencil(struct Depsgraph *depsgraph, struct View3D *v3d, struct GPUViewport *viewport); void DRW_draw_depth_object(struct ARegion *ar, - struct View3D *v3d, struct GPUViewport *viewport, struct Object *object); diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 6c3bc7eb021..89936d84275 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2494,7 +2494,7 @@ void DRW_draw_depth_loop_gpencil(struct Depsgraph *depsgraph, /** * Clears the Depth Buffer and draws only the specified object. */ -void DRW_draw_depth_object(ARegion *ar, View3D *v3d, GPUViewport *viewport, Object *object) +void DRW_draw_depth_object(ARegion *ar, GPUViewport *viewport, Object *object) { RegionView3D *rv3d = ar->regiondata; diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 8a0d1b5b322..0b98ad3cacd 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1128,8 +1128,8 @@ static void view3d_header_region_listener(wmWindow *UNUSED(win), break; } - /* From topbar, which ones are needed? split per header? */ - /* Disable for now, re-enable if neede, or remove - campbell. */ + /* From topbar, which ones are needed? split per header? */ + /* Disable for now, re-enable if neede, or remove - campbell. */ #if 0 /* context changes */ switch (wmn->category) { diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index e78eb790072..c705a8608d5 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -260,12 +260,11 @@ void ED_view3d_backbuf_depth_validate(ViewContext *vc) { if (vc->v3d->flag & V3D_INVALID_BACKBUF) { ARegion *ar = vc->ar; - RegionView3D *rv3d = ar->regiondata; Object *obact_eval = DEG_get_evaluated_object(vc->depsgraph, vc->obact); if (obact_eval && ((obact_eval->base_flag & BASE_VISIBLE) != 0)) { GPUViewport *viewport = WM_draw_region_get_viewport(ar, 0); - DRW_draw_depth_object(vc->ar, vc->v3d, viewport, obact_eval); + DRW_draw_depth_object(vc->ar, viewport, obact_eval); } vc->v3d->flag &= ~V3D_INVALID_BACKBUF; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index ce6a2af8c8f..af1f37701ee 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -4079,8 +4079,9 @@ static void rna_def_space_image(BlenderRNA *brna) RNA_def_struct_sdna(srna, "SpaceImage"); RNA_def_struct_ui_text(srna, "Space Image Editor", "Image and UV editor space data"); - rna_def_space_generic_show_region_toggles( - srna, (1 << RGN_TYPE_TOOL_HEADER) | (1 << RGN_TYPE_TOOLS) | (1 << RGN_TYPE_UI) | (1 << RGN_TYPE_HUD)); + rna_def_space_generic_show_region_toggles(srna, + ((1 << RGN_TYPE_TOOL_HEADER) | (1 << RGN_TYPE_TOOLS) | + (1 << RGN_TYPE_UI) | (1 << RGN_TYPE_HUD))); /* image */ prop = RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE); |