[Bf-blender-cvs] [075638f85cc] blender2.8: Cleanup: consistent arg order

[Campbell Barton]

Commit: 075638f85cc0056fb6b50ac5a40fe8b2e217a8b5
Author: Campbell Barton
Date:   Wed May 3 03:06:37 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB075638f85cc0056fb6b50ac5a40fe8b2e217a8b5

Cleanup: consistent arg order

===================================================================

M       source/blender/draw/DRW_engine.h
M       source/blender/draw/intern/draw_manager.c
M       source/blender/editors/space_view3d/view3d_draw_legacy.c
M       source/blender/editors/space_view3d/view3d_view.c

===================================================================

diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index 8811309bcc1..125a9d8d992 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -67,14 +67,14 @@ void DRW_draw_view(const struct bContext *C);
 
 void DRW_draw_render_loop(
         struct Depsgraph *graph,
-        struct View3D *v3d, struct ARegion *ar);
+        struct ARegion *ar, struct View3D *v3d);
 void DRW_draw_render_loop_offscreen(
         struct Depsgraph *graph,
-        struct View3D *v3d, struct ARegion *ar,
+        struct ARegion *ar, struct View3D *v3d,
         struct GPUOffScreen *ofs);
 void DRW_draw_select_loop(
         struct Depsgraph *graph,
-        struct View3D *v3d, struct ARegion *ar,
+        struct ARegion *ar, struct View3D *v3d,
         bool use_obedit_skip, bool use_nearest, const struct rcti *rect);
 void DRW_draw_depth_loop(
         struct Depsgraph *graph,
diff --git a/source/blender/draw/intern/draw_manager.c 
b/source/blender/draw/intern/draw_manager.c
index 07182ef2774..23293395fd4 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2180,12 +2180,11 @@ void DRW_draw_view(const bContext *C)
 {
        struct Depsgraph *graph = CTX_data_depsgraph(C);
        ARegion *ar = CTX_wm_region(C);
-//     RegionView3D *rv3d = ar->regiondata;
        View3D *v3d = CTX_wm_view3d(C);
 
        DST.draw_ctx.evil_C = C;
 
-       DRW_draw_render_loop(graph, v3d, ar);
+       DRW_draw_render_loop(graph, ar, v3d);
 }
 
 /**
@@ -2195,7 +2194,7 @@ void DRW_draw_view(const bContext *C)
  */
 void DRW_draw_render_loop(
         struct Depsgraph *graph,
-        View3D *v3d, ARegion *ar)
+        ARegion *ar, View3D *v3d)
 {
        Scene *scene = DAG_get_scene(graph);
        SceneLayer *sl = DAG_get_scene_layer(graph);
@@ -2280,7 +2279,7 @@ void DRW_draw_render_loop(
 
 void DRW_draw_render_loop_offscreen(
         struct Depsgraph *graph,
-        View3D *v3d, ARegion *ar, GPUOffScreen *ofs)
+        ARegion *ar, View3D *v3d, GPUOffScreen *ofs)
 {
        RegionView3D *rv3d = ar->regiondata;
 
@@ -2293,7 +2292,7 @@ void DRW_draw_render_loop_offscreen(
 
        DST.draw_ctx.evil_C = NULL;
 
-       DRW_draw_render_loop(graph, v3d, ar);
+       DRW_draw_render_loop(graph, ar, v3d);
 
        /* restore */
        {
@@ -2314,7 +2313,7 @@ void DRW_draw_render_loop_offscreen(
  */
 void DRW_draw_select_loop(
         struct Depsgraph *graph,
-        View3D *v3d, ARegion *ar,
+        ARegion *ar, View3D *v3d,
         bool UNUSED(use_obedit_skip), bool UNUSED(use_nearest), const rcti 
*rect)
 {
        Scene *scene = DAG_get_scene(graph);
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c 
b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 66876efd3e9..00431387fb1 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -1821,7 +1821,7 @@ void ED_view3d_draw_offscreen(
        }
        else {
                /* XXX, should take depsgraph as arg */
-               DRW_draw_render_loop_offscreen(scene->depsgraph, v3d, ar, ofs);
+               DRW_draw_render_loop_offscreen(scene->depsgraph, ar, v3d, ofs);
        }
 
        /* post process */
diff --git a/source/blender/editors/space_view3d/view3d_view.c 
b/source/blender/editors/space_view3d/view3d_view.c
index a1dcdd3abcf..c33b01149fc 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1191,7 +1191,7 @@ int view3d_opengl_select(
        else
 #else
        {
-               DRW_draw_select_loop(graph, v3d, ar, use_obedit_skip, 
use_nearest, &rect);
+               DRW_draw_select_loop(graph, ar, v3d, use_obedit_skip, 
use_nearest, &rect);
        }
 #endif /* WITH_OPENGL_LEGACY */
 
@@ -1208,7 +1208,7 @@ int view3d_opengl_select(
                else
 #else
                {
-                       DRW_draw_select_loop(graph, v3d, ar, use_obedit_skip, 
use_nearest, &rect);
+                       DRW_draw_select_loop(graph, ar, v3d, use_obedit_skip, 
use_nearest, &rect);
                }
 #endif /* WITH_OPENGL_LEGACY */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs