Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Nov 2017 05:28:05 +0000 (16:28 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Nov 2017 05:28:05 +0000 (16:28 +1100)
1  2 
source/blender/blenkernel/intern/blender.c