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

[Campbell Barton]

Commit: ddecf23711ec8a3a4247f78c01e3f1a0c36eaaea
Author: Campbell Barton
Date:   Tue Mar 27 07:08:58 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBddecf23711ec8a3a4247f78c01e3f1a0c36eaaea

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/sculpt_paint/paint_curve.c
index c9ad4a46a13,8d9812f41d9..fb8dea2af0e
--- a/source/blender/editors/sculpt_paint/paint_curve.c
+++ b/source/blender/editors/sculpt_paint/paint_curve.c
@@@ -32,18 -32,13 +32,16 @@@
  #include "DNA_screen_types.h"
  #include "DNA_space_types.h"
  #include "DNA_view3d_types.h"
 +#include "DNA_workspace_types.h"
  
  #include "BLI_math_vector.h"
- #include "BLI_string.h"
  
  #include "BKE_context.h"
  #include "BKE_main.h"
  #include "BKE_paint.h"
  
 +#include "DEG_depsgraph.h"
 +
- #include "ED_paint.h"
  #include "ED_view3d.h"
  
  #include "WM_api.h"
@@@ -59,10 -54,8 +57,9 @@@
  #define PAINT_CURVE_SELECT_THRESHOLD 40.0f
  #define PAINT_CURVE_POINT_SELECT(pcp, i) (*(&pcp->bez.f1 + i) = SELECT)
  
- 
  int paint_curve_poll(bContext *C)
  {
 +	const WorkSpace *workspace = CTX_wm_workspace(C);
  	Object *ob = CTX_data_active_object(C);
  	Paint *p;
  	RegionView3D *rv3d = CTX_wm_region_view3d(C);