Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 27 Mar 2018 05:08:58 +0000 (07:08 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 27 Mar 2018 05:08:58 +0000 (07:08 +0200)
1  2 
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sculpt_paint/paint_curve.c
source/blender/editors/sculpt_paint/paint_intern.h

index c9ad4a46a137e9c73a2a39314184c8ab6ec89447,8d9812f41d94f869894459475a6b9ec05b5fae97..fb8dea2af0e3a26d653bcd16f590ed0634b3b61e
  #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 "ED_paint.h"
 +#include "DEG_depsgraph.h"
 +
  #include "ED_view3d.h"
  
  #include "WM_api.h"
  #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);