Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 23 Feb 2017 21:09:09 +0000 (22:09 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 23 Feb 2017 21:09:09 +0000 (22:09 +0100)
commitdec323659dfe953341f6edbfbeaa174153460079
tree14fbcf78b9bd77d2ae4afa26b0a07e7c3a6affcd
parent2e83814e186f0d6746f0ce18123d6a5a67e07a64
parentc067f1d0d470ada577f2b722b543d814448ce550
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_scene.c