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)
commitdf2635099bfcc32aa71963684641be8077b524cb
tree43f698c4142d3086830d80f89ee850db48a38a25
parentc6f47ffa98d3fe9c83b2e19b9310a133e842685b
parent3f31ec83984b19efe174319ae1d86995a4c26ecc
Merge branch 'master' into blender2.8
source/blender/blenlib/intern/task.c