Merge branch 'blender-v3.5-release'

2023-02-20 15:37:02 +01:00
parent 9b7eb57cf7 c7d7175270
commit 8abef86217
1 changed files with 2 additions and 3 deletions
--- a/source/blender/gpu/metal/mtl_framebuffer.mm
+++ b/source/blender/gpu/metal/mtl_framebuffer.mm
@@ -1754,9 +1754,8 @@ void MTLFrameBuffer::blit(uint read_slot,
                          uint height,
                          eGPUFrameBufferBits blit_buffers)
 {
-  BLI_assert(this);
  BLI_assert(metal_fb_write);
-  if (!(this && metal_fb_write)) {
+  if (!metal_fb_write) {
    return;
  }
  MTLContext *mtl_context = reinterpret_cast<MTLContext *>(GPU_context_active_get());
@@ -1899,4 +1898,4 @@ int MTLFrameBuffer::get_height()
  return height_;
 }

-}  // blender::gpu
+}  // namespace blender::gpu