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

[Campbell Barton]

Commit: a2c0a382cd00b9b1a3058ad0017887e451b73465
Author: Campbell Barton
Date:   Tue Apr 3 14:19:51 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa2c0a382cd00b9b1a3058ad0017887e451b73465

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/mesh/editmesh_utils.c
index 393fa475a9b,41e8a963383..3382847c8a4
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@@ -43,7 -43,7 +43,6 @@@
  
  #include "BKE_DerivedMesh.h"
  #include "BKE_context.h"
- #include "BKE_main.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_mesh.h"
  #include "BKE_mesh_mapping.h"
  #include "BKE_report.h"
diff --cc source/blender/editors/physics/particle_edit.c
index 9deae22e4e1,bdffaf31384..14bcba3416f
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@@ -4436,7 -4376,7 +4436,8 @@@ void PE_create_particle_edit
  		recalc_lengths(edit);
  		if (psys && !cache)
  			recalc_emitter_field(ob, psys);
 -		PE_update_object(scene, ob, 1);
++
 +		PE_update_object(eval_ctx, scene, ob, 1);
  	}
  }
  
diff --cc source/blender/editors/physics/particle_edit_undo.c
index 1264800afc8,ef0a2711fdd..5199b1c54fa
--- a/source/blender/editors/physics/particle_edit_undo.c
+++ b/source/blender/editors/physics/particle_edit_undo.c
@@@ -44,15 -44,12 +44,13 @@@
  #include "BLI_string.h"
  #include "BLI_utildefines.h"
  
- #include "BKE_global.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_particle.h"
  #include "BKE_pointcache.h"
  #include "BKE_context.h"
- #include "BKE_main.h"
  #include "BKE_undo_system.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "ED_object.h"
  #include "ED_particle.h"
  #include "ED_physics.h"
diff --cc source/blender/editors/sculpt_paint/paint_image_undo.c
index 5308ef0fae8,554ddf92150..5184f5cc757
--- a/source/blender/editors/sculpt_paint/paint_image_undo.c
+++ b/source/blender/editors/sculpt_paint/paint_image_undo.c
@@@ -39,14 -38,13 +39,14 @@@
  #include "IMB_imbuf_types.h"
  
  #include "BKE_context.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_image.h"
  #include "BKE_main.h"
- #include "BKE_global.h"
  #include "BKE_undo_system.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "ED_paint.h"
+ #include "ED_undo.h"
  
  #include "GPU_draw.h"
  
diff --cc source/blender/editors/sculpt_paint/sculpt_undo.c
index 7158c0fc88f,e90d2b58c0c..694e1f048f5
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@@ -59,11 -59,8 +59,10 @@@
  #include "BKE_key.h"
  #include "BKE_mesh.h"
  #include "BKE_subsurf.h"
- #include "DEG_depsgraph.h"
- #include "BKE_global.h"
- #include "BKE_main.h"
  #include "BKE_undo_system.h"
  
++#include "DEG_depsgraph.h"
++
  #include "WM_api.h"
  #include "WM_types.h"
  
diff --cc source/blender/editors/space_action/action_buttons.c
index 82768bedc95,ba6cef38acd..3ba59b3be75
--- a/source/blender/editors/space_action/action_buttons.c
+++ b/source/blender/editors/space_action/action_buttons.c
@@@ -48,8 -48,8 +48,7 @@@
  
  #include "BKE_context.h"
  #include "BKE_curve.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_fcurve.h"
- #include "BKE_main.h"
  #include "BKE_screen.h"
  #include "BKE_unit.h"