Merge branch 'master' into temp_bmesh_multires

2 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc
index f90c37e5c50..42b85da1f93 100644
--- a/source/blender/gpu/opengl/gl_backend.cc
+++ b/source/blender/gpu/opengl/gl_backend.cc
@@ -90,7 +90,7 @@ void GLBackend::platform_init()
       device |= GPU_DEVICE_INTEL_UHD;
     }
   }
-  else if ((strstr(renderer, "Mesa DRI R")) ||
+  else if (strstr(renderer, "Mesa DRI R") ||
            (strstr(renderer, "Radeon") && strstr(vendor, "X.Org")) ||
            (strstr(renderer, "AMD") && strstr(vendor, "X.Org")) ||
            (strstr(renderer, "Gallium ") && strstr(renderer, " on ATI ")) ||
diff --git a/source/blender/gpu/opengl/gl_framebuffer.cc b/source/blender/gpu/opengl/gl_framebuffer.cc
index e87b22985bd..8da114d9270 100644
--- a/source/blender/gpu/opengl/gl_framebuffer.cc
+++ b/source/blender/gpu/opengl/gl_framebuffer.cc
@@ -268,7 +268,7 @@ void GLFrameBuffer::bind(bool enabled_srgb)
   }
 
   if (context_ != GLContext::get()) {
-    BLI_assert(!"Trying to use the same frame-buffer in multiple context");
+    BLI_assert_msg(0, "Trying to use the same frame-buffer in multiple context");
     return;
   }
 
@@ -379,7 +379,7 @@ void GLFrameBuffer::clear_attachment(GPUAttachmentType type,
       glClearBufferfv(GL_DEPTH, 0, &depth);
     }
     else {
-      BLI_assert(!"Unhandled data format");
+      BLI_assert_msg(0, "Unhandled data format");
     }
   }
   else {
@@ -395,7 +395,7 @@ void GLFrameBuffer::clear_attachment(GPUAttachmentType type,
         glClearBufferiv(GL_COLOR, slot, (GLint *)clear_value);
         break;
       default:
-        BLI_assert(!"Unhandled data format");
+        BLI_assert_msg(0, "Unhandled data format");
         break;
     }
   }