[Bf-blender-cvs] [219c3aa6535] master: Cleanup: remove unused perspective argument to off-screen drawing

Campbell Barton noreply at git.blender.org
Fri Nov 20 02:16:28 CET 2020


Commit: 219c3aa6535c72594ce7e641b65abc5a47a5badf
Author: Campbell Barton
Date:   Fri Nov 20 12:03:22 2020 +1100
Branches: master
https://developer.blender.org/rB219c3aa6535c72594ce7e641b65abc5a47a5badf

Cleanup: remove unused perspective argument to off-screen drawing

Some callers were passing in dummy values, this can be accessed from
`RegionView3D.is_persp` can be used to check this.

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

M	source/blender/editors/include/ED_view3d_offscreen.h
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/python/gpu/gpu_py_offscreen.c
M	source/blender/windowmanager/xr/intern/wm_xr_draw.c

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

diff --git a/source/blender/editors/include/ED_view3d_offscreen.h b/source/blender/editors/include/ED_view3d_offscreen.h
index 2833d205e77..69756f1cd79 100644
--- a/source/blender/editors/include/ED_view3d_offscreen.h
+++ b/source/blender/editors/include/ED_view3d_offscreen.h
@@ -52,7 +52,6 @@ void ED_view3d_draw_offscreen(struct Depsgraph *depsgraph,
                               const float winmat[4][4],
                               bool is_image_render,
                               bool do_sky,
-                              bool is_persp,
                               const char *viewname,
                               const bool do_color_management,
                               struct GPUOffScreen *ofs,
@@ -70,7 +69,6 @@ void ED_view3d_draw_offscreen_simple(struct Depsgraph *depsgraph,
                                      float clip_end,
                                      bool is_image_render,
                                      bool do_sky,
-                                     bool is_persp,
                                      const char *viewname,
                                      const bool do_color_management,
                                      struct GPUOffScreen *ofs,
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index d4c85eeb3d2..56c127e986f 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1667,7 +1667,6 @@ void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
                               const float winmat[4][4],
                               bool is_image_render,
                               bool do_sky,
-                              bool UNUSED(is_persp),
                               const char *viewname,
                               const bool do_color_management,
                               GPUOffScreen *ofs,
@@ -1761,7 +1760,6 @@ void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
                                      float clip_end,
                                      bool is_image_render,
                                      bool do_sky,
-                                     bool is_persp,
                                      const char *viewname,
                                      const bool do_color_management,
                                      GPUOffScreen *ofs,
@@ -1825,7 +1823,6 @@ void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
                            winmat,
                            is_image_render,
                            do_sky,
-                           is_persp,
                            viewname,
                            do_color_management,
                            ofs,
@@ -1943,7 +1940,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Depsgraph *depsgraph,
                            winmat,
                            true,
                            draw_sky,
-                           !is_ortho,
                            viewname,
                            do_color_management,
                            ofs,
diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c
index d6548834f2d..aa85b130888 100644
--- a/source/blender/python/gpu/gpu_py_offscreen.c
+++ b/source/blender/python/gpu/gpu_py_offscreen.c
@@ -265,7 +265,6 @@ static PyObject *bpygpu_offscreen_draw_view3d(BPyGPUOffScreen *self,
                            (float(*)[4])py_mat_projection->matrix,
                            true,
                            true,
-                           true,
                            "",
                            false,
                            self->ofs,
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_draw.c b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
index 5630d294e8d..1b1ea6c1e61 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_draw.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.c
@@ -142,7 +142,6 @@ void wm_xr_draw_view(const GHOST_XrDrawViewInfo *draw_view, void *customdata)
                                   settings->clip_end,
                                   false,
                                   true,
-                                  true,
                                   NULL,
                                   false,
                                   surface_data->offscreen,



More information about the Bf-blender-cvs mailing list