Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 17 Oct 2018 14:50:09 +0000 (16:50 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 17 Oct 2018 14:50:36 +0000 (16:50 +0200)
Conflicts:
source/blender/blenkernel/BKE_global.h
source/blender/editors/undo/ed_undo.c

1  2 
source/blender/blenkernel/BKE_global.h
source/blender/editors/undo/ed_undo.c
source/blender/python/intern/bpy_app.c

index 515e96db25d35f50e6d6304746123df42754f3e1,c69fabdbd7097d00c36052a10a26cfb370c6cf26..1d5c57a39b437eb06c6e2e48140c2246dfb86227
  #include "BKE_context.h"
  #include "BKE_global.h"
  #include "BKE_main.h"
+ #include "BKE_report.h"
 +#include "BKE_scene.h"
  #include "BKE_screen.h"
 +#include "BKE_layer.h"
  #include "BKE_undo_system.h"
 +#include "BKE_workspace.h"
 +#include "BKE_paint.h"
  
 -#include "BLO_runtime.h"
++#include "BLO_writefile.h"
  #include "ED_gpencil.h"
  #include "ED_render.h"
 +#include "ED_object.h"
  #include "ED_screen.h"
  #include "ED_undo.h"