UPBGE: Fix compilation

UPBGE · Jan 7, 2025 · 192aa98 · 192aa98
1 parent 88ad569
commit 192aa98
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/source/blender/draw/engines/eevee_next/eevee_view.cc b/source/blender/draw/engines/eevee_next/eevee_view.cc
@@ -138,7 +138,9 @@ void ShadingView::render()
                                   rt_buffer_opaque_,
                                   rt_buffer_refract_);
 
-  inst_.pipelines.background.render(render_view_, combined_fb_);
+  if (DRW_state_draw_background()) {  // UPBGE: for overlay pass
+    inst_.pipelines.background.render(render_view_, combined_fb_);
+  }
 
   inst_.gbuffer.release();
 

diff --git a/source/blender/python/generic/bgl.hh b/source/blender/python/generic/bgl.hh
@@ -13,7 +13,7 @@ PyObject *BPyInit_bgl();
 /* This API is deprecated, currently these are only used in `bgl.cc`
  * and there should be no reason to make use of them in the future.
  * Use a define to indicate they are part of the public API which is being phased out. */
-#ifdef USE_BGL_DEPRECATED_API
+//#ifdef USE_BGL_DEPRECATED_API
 
 /**
  * Buffer Object
@@ -56,4 +56,4 @@ struct Buffer *BGL_MakeBuffer(int type,
 
 int BGL_typeSize(int type);
 
-#endif /* USE_BGL_DEPRECATED_API */
+//#endif /* USE_BGL_DEPRECATED_API */
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -58,7 +58,6 @@
 #  include "DNA_ID.h"
 #  include "DNA_scene_types.h"
 #  include "MEM_guardedalloc.h"
-#  include "bgl.h"
 #  include "bl_math_py_api.hh"
 #  include "blf_py_api.hh"
 #  include "bmesh/bmesh_py_api.hh"

diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp
@@ -9,7 +9,7 @@
 
 #include <epoxy/gl.h>
 #include "MEM_guardedalloc.h"
-#include "bgl.h"
+#include "bgl.hh"
 
 #include "Exception.h"
 

diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp
@@ -11,7 +11,7 @@
 
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
-#include "bgl.h"
+#include "bgl.hh"
 
 #include "Exception.h"
 #include "FilterSource.h"