Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 4 Dec 2018 10:45:22 +0000 (11:45 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 4 Dec 2018 10:45:22 +0000 (11:45 +0100)
1  2 
source/blender/blenlib/intern/task.c

Simple merge