Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 3 Apr 2018 14:13:13 +0000 (16:13 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 3 Apr 2018 14:13:13 +0000 (16:13 +0200)
commit6744c34a263798c54a6e1afb699039dc4fac6163
tree1a6ed5579b64886eb77ae1beb1c724294d9b3346
parent7e9a80530fad5bf577eebd2e7ffb1f1aa1b523da
parent96f565b380a8552e91151b9879746a1992283a35
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/space_info.py
source/blender/makesrna/intern/rna_rna.c