diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2020-11-17 06:10:51 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2020-11-17 06:10:51 +0300 |
| commit | 797dfa6a0a7d5d2bf62bdc03cf619addbc9e1064 (patch) | |
| tree | 5a1e0f0a6b2439ceee4a8e0bae82b243e3831156 /source/blender/imbuf | |
| parent | 09045ff64d1f0948489354bd097f2930f45bacb9 (diff) | |
| parent | 75bd286813eb5e3c227696b4cfd5616b17166641 (diff) | |
Merge branch 'blender-v2.91-release'
Conflicts:
source/blender/editors/render/render_opengl.c
source/blender/sequencer/intern/effects.c
Diffstat (limited to 'source/blender/imbuf')
0 files changed, 0 insertions, 0 deletions