Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 3 Oct 2016 18:48:00 +0000 (20:48 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 3 Oct 2016 18:48:00 +0000 (20:48 +0200)
commit55aadccbde3a44f9e9a7046f1478e31e2475f60c
treecab220402c0b742b9af330ca02d0ee913a9029c2
parent72473a61b0a45cf31a42927e9b86d0f26a25590d
parent103fbb3afc076383b94910e535374c5db398d06c
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_userdef.c