Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 26 Nov 2017 19:29:56 +0000 (20:29 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 26 Nov 2017 19:29:56 +0000 (20:29 +0100)
commitde09366d573d36ac96fa7dd9a20e87b6fad5ba02
tree09d9aca5bae47a6852dda657fb5134c6080f9789
parent9aece5e1e7748fa6020a3b6cbeabd17e1dc3bbaa
parent440aa2bf70468d630c1dc70c719aad67496a47d5
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/mask/mask_draw.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/mask/mask_draw.c