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)
commitbe4ebb7fa6c4b0678803c75d20c080e0b1db4877
tree9682998b2408e5b7021eae57be8089460103523f
parent5db950e860b2f64078cfc8cf00cb4f430b8a1baf
parent97597ed6002211d55565d2a281da3c3fc1098ebb
Merge branch 'master' into blender2.8
source/blender/makesrna/RNA_types.h