[Bf-blender-cvs] [d31ea3b89aa] blender2.8: Merge branch 'master' into blender2.8

Bastien Montagne noreply at git.blender.org
Wed Oct 17 16:50:45 CEST 2018


Commit: d31ea3b89aa8d583a6d089f96dff46c0759f8c8a
Author: Bastien Montagne
Date:   Wed Oct 17 16:50:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd31ea3b89aa8d583a6d089f96dff46c0759f8c8a

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_global.h
	source/blender/editors/undo/ed_undo.c

===================================================================



===================================================================

diff --cc source/blender/editors/undo/ed_undo.c
index 515e96db25d,c69fabdbd70..1d5c57a39b4
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@@ -48,16 -47,14 +48,19 @@@
  #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"



More information about the Bf-blender-cvs mailing list