Merge branch 'blender-v2.82-release'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Jan 2020 18:26:20 +0000 (19:26 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Jan 2020 18:26:20 +0000 (19:26 +0100)
1  2 
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/makesrna/intern/rna_particle.c