blender
/
blender
127
395
Fork 565
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: formatting, unused args

This commit is contained in:
Campbell Barton 2019-04-20 09:15:06 +02:00
parent 2a39f2595b
commit 44ca116ca2
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/draw/DRW_engine.h
View File

@ -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);

2
source/blender/draw/intern/draw_manager.c
View File

@ -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;

4
source/blender/editors/space_view3d/space_view3d.c
View File

@ -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) {

3
source/blender/editors/space_view3d/view3d_draw_legacy.c
View File

@ -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;

5
source/blender/makesrna/intern/rna_space.c
View File

@ -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);