Merge branch 'master' into blender2.8
authormano-wii <germano.costa@ig.com.br>
Fri, 15 Sep 2017 17:19:22 +0000 (14:19 -0300)
committermano-wii <germano.costa@ig.com.br>
Fri, 15 Sep 2017 17:19:22 +0000 (14:19 -0300)
commit208d6f28c8125dafd60bdf391a51145d6d7f46ec
treeddfeb9d68cc0e5cc735359c475a360c89eeeb53d
parent4fae536f60a9c37d74a73660520bb569afc4c92a
parent14eadf55fddb08d4b62a53eb59b04439ed66d187
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_space.c