Clément Foucault
d1c8699f83
# Conflicts: # source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh # source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh # source/blender/gpu/intern/gpu_shader_create_info.cc # source/blender/gpu/intern/gpu_shader_create_info.hh # source/blender/gpu/metal/kernels/depth_2d_update_info.hh # source/blender/gpu/metal/mtl_shader_generator.mm