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

[Campbell Barton]

Commit: 89fdd8890633700f559039998f8d95c7a5f97df4
Author: Campbell Barton
Date:   Mon Apr 2 15:18:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB89fdd8890633700f559039998f8d95c7a5f97df4

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/CMakeLists.txt
index c7ce4b44803,17a8eef1bdb..06f412b7019
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@@ -60,9 -59,9 +60,10 @@@ if(WITH_BLENDER
  	add_subdirectory(space_userpref)
  	add_subdirectory(space_view3d)
  	add_subdirectory(transform)
+ 	add_subdirectory(undo)
  	add_subdirectory(util)
  	add_subdirectory(uvedit)
 +	add_subdirectory(screen)
  endif()
  
  add_subdirectory(datafiles)
diff --cc source/blender/editors/curve/editcurve_undo.c
index 5775835e5ff,4ced6ce506c..4eb2abaefad
--- a/source/blender/editors/curve/editcurve_undo.c
+++ b/source/blender/editors/curve/editcurve_undo.c
@@@ -210,8 -218,8 +219,8 @@@ static void curve_undosys_step_decode(s
  
  	CurveUndoStep *us = (CurveUndoStep *)us_p;
  	Object *obedit = us->obedit_ref.ptr;
- 	undocurve_to_editcurve(&us->data, obedit->data);
+ 	undocurve_to_editcurve(&us->data, obedit->data, &obedit->shapenr);
 -	DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
 +	DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
  	WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
  }
  
diff --cc source/blender/editors/interface/interface_handlers.c
index 8a2baa53d30,9f7cd62227c..e01121ed277
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -74,10 -73,8 +74,10 @@@
  #include "BKE_unit.h"
  #include "BKE_paint.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "ED_screen.h"
- #include "ED_util.h"
+ #include "ED_undo.h"
  #include "ED_keyframing.h"
  
  #include "UI_interface.h"
diff --cc source/blender/editors/mesh/editmesh_bisect.c
index 1937a9f6891,3a9e278f039..741d16206cd
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@@ -54,13 -53,6 +54,13 @@@
  
  #include "mesh_intern.h"  /* own include */
  
 +#define USE_MANIPULATOR
 +
 +#ifdef USE_MANIPULATOR
 +#include "ED_manipulator_library.h"
- #include "ED_util.h"
++#include "ED_undo.h"
 +#endif
 +
  static int mesh_bisect_exec(bContext *C, wmOperator *op);
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/editors/mesh/editmesh_extrude.c
index 657c3eb2a40,93049528146..64980b84a0b
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@@ -52,19 -51,8 +52,19 @@@
  #include "ED_transform.h"
  #include "ED_view3d.h"
  
 +#include "UI_resources.h"
 +
 +#include "MEM_guardedalloc.h"
 +
  #include "mesh_intern.h"  /* own include */
  
 +#define USE_MANIPULATOR
 +
 +#ifdef USE_MANIPULATOR
 +#include "ED_manipulator_library.h"
- #include "ED_util.h"
++#include "ED_undo.h"
 +#endif
 +
  /* -------------------------------------------------------------------- */
  /** \name Extrude Internal Utilities
   * \{ */
diff --cc source/blender/editors/space_outliner/outliner_tools.c
index 1da1efc9cf4,84711bf7c3c..c19dcc0e1cb
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@@ -65,15 -64,11 +65,15 @@@
  #include "BKE_scene.h"
  #include "BKE_sequencer.h"
  
 +#include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_build.h"
 +
  #include "ED_armature.h"
  #include "ED_object.h"
 +#include "ED_scene.h"
  #include "ED_screen.h"
  #include "ED_sequencer.h"
- #include "ED_util.h"
+ #include "ED_undo.h"
  
  #include "WM_api.h"
  #include "WM_types.h"
diff --cc source/blender/editors/undo/memfile_undo.c
index 69904b7f1b4,c336069bff8..756c46b4e8a
--- a/source/blender/editors/undo/memfile_undo.c
+++ b/source/blender/editors/undo/memfile_undo.c
@@@ -43,20 -43,8 +43,20 @@@
  
  #include "../blenloader/BLO_undofile.h"
  
- #include "util_intern.h"
+ #include "undo_intern.h"
  
 +/** Store workspace modes in undo steps, this may be removed if find a better way to handle. */
 +#define USE_WORKSPACE_OBJECT_MODE_HACK
 +
 +#ifdef USE_WORKSPACE_OBJECT_MODE_HACK
 +#include "MEM_guardedalloc.h"
 +#include "BLI_string.h"
 +#include "BLI_listbase.h"
 +#include "BKE_main.h"
 +#include "DNA_workspace_types.h"
 +#endif
 +
 +
  /* -------------------------------------------------------------------- */
  /** \name Implements ED Undo System
   * \{ */
diff --cc source/blender/windowmanager/intern/wm_operators.c
index ebe68bc8f35,f46358f83cf..e19ec6ca265
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@@ -99,9 -96,11 +99,9 @@@
  
  #include "ED_numinput.h"
  #include "ED_screen.h"
- #include "ED_util.h"
+ #include "ED_undo.h"
  #include "ED_view3d.h"
  
 -#include "GPU_basic_shader.h"
 -
  #include "RNA_access.h"
  #include "RNA_define.h"
  #include "RNA_enum_types.h"