Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 21:49:55 +0000 (07:49 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 21:50:45 +0000 (07:50 +1000)
commit2a14807f397c138473fb7ad880f49de154da59c5
treeff46488c392ada00c6d1488f2b3ef864a672e201
parentdf289785b3ce2fa9d45550346e410a66b664f8a5
parent6873f47edea909061389b3d9037f8cdfed9b9231
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_material.c