Cleanup: formatting, unused args
authorCampbell Barton <ideasman42@gmail.com>
Sat, 20 Apr 2019 07:15:06 +0000 (09:15 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 20 Apr 2019 07:15:06 +0000 (09:15 +0200)
source/blender/draw/DRW_engine.h
source/blender/draw/intern/draw_manager.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/makesrna/intern/rna_space.c

index d0b7c10..da1f5c7 100644 (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);
 
index 6c3bc7e..89936d8 100644 (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;
 
index 8a0d1b5..0b98ad3 100644 (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) {
index e78eb79..c705a86 100644 (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;
index ce6a2af..af1f377 100644 (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);