Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Nov 2018 14:02:13 +0000 (15:02 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Nov 2018 14:02:13 +0000 (15:02 +0100)
1  2 
source/blender/blenlib/intern/task.c

Simple merge