Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 15 Jun 2017 14:37:10 +0000 (16:37 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 15 Jun 2017 14:37:10 +0000 (16:37 +0200)
commit60c5b3f76fe7c7027b7637f9d53e657ffd6d0402
tree518bd0c91c832889bb4ca42f3c0833fd90a4611b
parenta35e733ff18fcdf5b57937cd85f9bcd6aec236b0
parent3d03616772b760f968bd4d4791c6073817c10586
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/blendfile.c