Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 17 Sep 2018 08:23:55 +0000 (10:23 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 17 Sep 2018 08:23:55 +0000 (10:23 +0200)
commit231a3845876d63e0b4f25365b422ecd031079c3a
treebf7a351fef70bb95649986077e692fe2c0405626
parent7b11558aa83c44035da2b03e67b0c64fa450dab5
parent640fcc25a4a227c816cf4523e467f03cbafab9e9
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface_templates.c