Merge with -r 22620:23107.
[blender.git] / source / blender / makesrna / intern / rna_material_api.c