# Conflicts: # source/blender/gpu/opengl/gl_backend.cc # Conflicts: # source/blender/gpu/opengl/gl_shader.cc Pull Request: https://projects.blender.org/blender/blender/pulls/116600
# Conflicts: # source/blender/gpu/opengl/gl_backend.cc # Conflicts: # source/blender/gpu/opengl/gl_shader.cc Pull Request: https://projects.blender.org/blender/blender/pulls/116600