[Bf-blender-cvs] [f166fa67b75] master: Cleanup: rename do_sky argument to draw_background

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


Commit: f166fa67b75fa58a7013c7ee48ca19f5eedfbcf0
Author: Campbell Barton
Date:   Fri Nov 20 12:10:50 2020 +1100
Branches: master
https://developer.blender.org/rBf166fa67b75fa58a7013c7ee48ca19f5eedfbcf0

Cleanup: rename do_sky argument to draw_background

This was leftover from Blender internal, follow the naming
already used by the draw manager.

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

M	source/blender/editors/include/ED_view3d_offscreen.h
M	source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/source/blender/editors/include/ED_view3d_offscreen.h b/source/blender/editors/include/ED_view3d_offscreen.h
index 69756f1cd79..e854982c796 100644
--- a/source/blender/editors/include/ED_view3d_offscreen.h
+++ b/source/blender/editors/include/ED_view3d_offscreen.h
@@ -51,7 +51,7 @@ void ED_view3d_draw_offscreen(struct Depsgraph *depsgraph,
                               const float viewmat[4][4],
                               const float winmat[4][4],
                               bool is_image_render,
-                              bool do_sky,
+                              bool draw_background,
                               const char *viewname,
                               const bool do_color_management,
                               struct GPUOffScreen *ofs,
@@ -68,7 +68,7 @@ void ED_view3d_draw_offscreen_simple(struct Depsgraph *depsgraph,
                                      float clip_start,
                                      float clip_end,
                                      bool is_image_render,
-                                     bool do_sky,
+                                     bool draw_background,
                                      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 56c127e986f..454cb50eeaf 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1666,7 +1666,7 @@ void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
                               const float viewmat[4][4],
                               const float winmat[4][4],
                               bool is_image_render,
-                              bool do_sky,
+                              bool draw_background,
                               const char *viewname,
                               const bool do_color_management,
                               GPUOffScreen *ofs,
@@ -1724,7 +1724,7 @@ void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
                                  region,
                                  v3d,
                                  is_image_render,
-                                 do_sky,
+                                 draw_background,
                                  do_color_management,
                                  ofs,
                                  viewport);
@@ -1759,7 +1759,7 @@ void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
                                      float clip_start,
                                      float clip_end,
                                      bool is_image_render,
-                                     bool do_sky,
+                                     bool draw_background,
                                      const char *viewname,
                                      const bool do_color_management,
                                      GPUOffScreen *ofs,
@@ -1822,7 +1822,7 @@ void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
                            viewmat,
                            winmat,
                            is_image_render,
-                           do_sky,
+                           draw_background,
                            viewname,
                            do_color_management,
                            ofs,



More information about the Bf-blender-cvs mailing list