diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-26 22:25:16 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-26 22:27:16 +0300 |
| commit | af87b6d8cb75d9d625378dee25d726a0d55f75c6 (patch) | |
| tree | b400a9a7e8d63dc2e60c45e988e969798c066d3b /source/blender/draw/intern/shaders/common_obinfos_lib.glsl | |
| parent | 42d2c96d4cceab46de8eebf30497e7399a2998e0 (diff) | |
| parent | 57dfec79f4ab1ceeb8c5f6049aa03e779e7871c0 (diff) | |
Merge branch 'master' into draw-viewport-data
# Conflicts:
# source/blender/draw/DRW_engine_types.h
# source/blender/draw/intern/draw_manager.c
# source/blender/draw/intern/draw_manager.h
# source/blender/draw/intern/draw_manager_profiling.c
# source/blender/draw/intern/draw_manager_text.h
# source/blender/draw/intern/draw_texture_pool.cc
# source/blender/draw/intern/draw_texture_pool.h
# source/blender/draw/intern/draw_view_data.cc
# source/blender/draw/intern/draw_view_data.h
# source/blender/editors/space_view3d/view3d_draw.c
# source/blender/gpu/GPU_texture.h
# source/blender/gpu/GPU_viewport.h
# source/blender/gpu/intern/gpu_shader_create_info_private.hh
# source/blender/gpu/intern/gpu_viewport.c
Diffstat (limited to 'source/blender/draw/intern/shaders/common_obinfos_lib.glsl')
0 files changed, 0 insertions, 0 deletions