Merge branch 'blender-v2.83-release'
authorPhilipp Oeser <info@graphics-engineer.com>
Tue, 19 May 2020 11:59:39 +0000 (13:59 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Tue, 19 May 2020 11:59:39 +0000 (13:59 +0200)
1  2 
CMakeLists.txt
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/pbvh.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/editors/armature/armature_relations.c
source/blender/makesrna/intern/rna_fluid.c
source/blender/modifiers/intern/MOD_mask.cc
source/blender/windowmanager/intern/wm_draw.c

diff --cc CMakeLists.txt
Simple merge
Simple merge