Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Fri, 4 May 2018 12:22:48 +0000 (09:22 -0300)
committerGermano <germano.costa@ig.com.br>
Fri, 4 May 2018 12:22:48 +0000 (09:22 -0300)
commit02baf714093e7bfbcd6a72ea8032b2cff74a1f00
treebf511df466a11a64d93d67cd2df6ebe649c7c9a6
parent3f95daa31fa98b1bd67fc71835f0011287c1d136
parentaea637456e7db640f9a1a83416769245a9b18a7d
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_object_api.c