[Bf-blender-cvs] [0dff6b2b4bd] master: Cleanup: unused main argument

Campbell Barton noreply at git.blender.org
Tue Aug 4 13:28:19 CEST 2020


Commit: 0dff6b2b4bd74107f3736617d0572d0a47d7383f
Author: Campbell Barton
Date:   Tue Aug 4 20:22:07 2020 +1000
Branches: master
https://developer.blender.org/rB0dff6b2b4bd74107f3736617d0572d0a47d7383f

Cleanup: unused main argument

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

M	source/blender/draw/intern/draw_manager.c
M	source/blender/windowmanager/WM_api.h
M	source/blender/windowmanager/intern/wm_init_exit.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 712a93e8880..49b12aecf28 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2716,7 +2716,7 @@ void DRW_engines_free(void)
 void DRW_render_context_enable(Render *render)
 {
   if (G.background && DST.gl_context == NULL) {
-    WM_init_opengl(G_MAIN);
+    WM_init_opengl();
   }
 
   void *re_gl_context = RE_gl_context_get(render);
@@ -2835,7 +2835,7 @@ void DRW_opengl_context_disable_ex(bool restore)
 void DRW_opengl_context_enable(void)
 {
   if (G.background && DST.gl_context == NULL) {
-    WM_init_opengl(G_MAIN);
+    WM_init_opengl();
   }
   DRW_opengl_context_enable_ex(true);
 }
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 3d4c84805f9..c0b2643d78d 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -99,7 +99,7 @@ void WM_main(struct bContext *C) ATTR_NORETURN;
 
 void WM_init_splash(struct bContext *C);
 
-void WM_init_opengl(struct Main *bmain);
+void WM_init_opengl(void);
 
 void WM_check(struct bContext *C);
 void WM_reinit_gizmomap_all(struct Main *bmain);
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 0390bc1e4ef..85694dec9c8 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -171,7 +171,7 @@ void WM_init_state_start_with_console_set(bool value)
  */
 static bool opengl_is_init = false;
 
-void WM_init_opengl(Main *UNUSED(bmain))
+void WM_init_opengl(void)
 {
   /* must be called only once */
   BLI_assert(opengl_is_init == false);
@@ -312,7 +312,7 @@ void WM_init(bContext *C, int argc, const char **argv)
     /* sets 3D mouse deadzone */
     WM_ndof_deadzone_set(U.ndof_deadzone);
 #endif
-    WM_init_opengl(G_MAIN);
+    WM_init_opengl();
 
     if (!WM_platform_support_perform_checks()) {
       exit(-1);



More information about the Bf-blender-cvs mailing list