Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 9 Feb 2018 13:27:32 +0000 (14:27 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 9 Feb 2018 13:27:32 +0000 (14:27 +0100)
1  2 
source/blender/makesrna/RNA_types.h

Simple merge