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)
commit7eb4c850d382b02fa2eea349ab6718ebbcd4b768
tree59a29398ad7565dae5bd29a6f3c9123023eef295
parent77dcf0fbc51afffb0d359dfaae4c30f864565522
parent554024e08e7855685446b33d8bdbde5cacc196a5
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/ui.py
source/blender/blenkernel/intern/dynamicpaint.c