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)
1  2 
source/blender/blenlib/BLI_callbacks.h
source/blender/render/intern/source/pipeline.c
source/creator/creator_args.c
source/creator/creator_signals.c

Simple merge
Simple merge