Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 08:52:40 +0000 (10:52 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 08:52:40 +0000 (10:52 +0200)
commitef423d9876378bf7568da69b70594f1d5d18f376
tree0dd3ed747ce017e6294e22c3516afa509fb12b62
parent80a983ae5e506850e94f8a9bd410d2b1eca5691f
parentf4213c1408619d1071004247ed099e2ba98a3e9a
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/idprop.c
source/blender/editors/interface/interface.c