Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 8 Dec 2017 13:54:59 +0000 (14:54 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 8 Dec 2017 13:54:59 +0000 (14:54 +0100)
commit6e85c5925078c1b9625714ca8bf80d54ba007ffc
tree45a2eeb6a2a6979f5ba08dc7d2e99ce2573cba50
parent087997f9ebcb90724120d736b885d5d7834f9e0f
parentf39a97fac5e619541550874ee230f3ed374d1183
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_templates.c