Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 15 Jun 2018 15:43:18 +0000 (17:43 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 15 Jun 2018 15:43:18 +0000 (17:43 +0200)
commitecc57e7524bf04d498646715dcf4f9340ef3fc56
tree220f951e1ff1be7bc769a1401845928f3f581330
parent9c629b06bfdf645c009d953902c936b82900053a
parentd645b1a78a752950d061a4ccb125721acade5544
Merge branch 'master' into blender2.8
source/blender/blenlib/BLI_callbacks.h
source/blender/render/intern/source/pipeline.c
source/creator/creator_args.c
source/creator/creator_signals.c