Merge branch 'blender-v2.82-release'
authorPablo Dobarro <pablodp606@gmail.com>
Tue, 4 Feb 2020 14:33:19 +0000 (15:33 +0100)
committerPablo Dobarro <pablodp606@gmail.com>
Tue, 4 Feb 2020 14:33:19 +0000 (15:33 +0100)
1  2 
intern/cycles/render/nodes.cpp
source/blender/editors/sculpt_paint/sculpt.c

Simple merge