Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 12 Jan 2017 11:59:45 +0000 (12:59 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 12 Jan 2017 11:59:45 +0000 (12:59 +0100)
1  2 
intern/cycles/blender/addon/ui.py
source/blender/blenkernel/intern/dynamicpaint.c

Simple merge