Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Sun, 9 Apr 2017 20:51:38 +0000 (22:51 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Sun, 9 Apr 2017 20:51:38 +0000 (22:51 +0200)
commit15bcfaa36b0d2a8831a3068f8a45e6d48e880d2e
tree3dcdfa9c1c34be3cc56cfb5ffcc06c1415e04ef0
parent928f5df1b4bd2304c44c98ff791ae9fa2c7d4f86
parent5b873c8c24bf90cb53da5760fe5435e16e1c8665
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/idprop.c