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)
commitfb7d23bdb2a5c0ed00067045e4acdf6593258b52
tree227357a88bf78ff5596c3217e4454ca856427519
parent100ffd3c0f9ec9ea4536f3428a5e8ed512f24b1c
parent434ed96dd2aafe787d17925b929b12774cea2c62
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/blender.c