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)
commit5c632ced53f68a096cd92eaa98c785bca1942832
tree15dd94dd34cf3eae77b35b63c88b74b65a9a96a9
parent98bcd52ef25be67605a7f58d8ae93ce11881140b
parent01e8e7dc6d9dd3710e0e3872b2d70196ac654d14
Merge branch 'master' into blender2.8
source/blender/blenlib/intern/task.c