[Bf-blender-cvs] [f9228bd] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: f9228bd530926d5fdb871c5f9f36262af690233d
Author: Antony Riakiotakis
Date:   Thu May 8 21:23:26 2014 +0300
https://developer.blender.org/rBf9228bd530926d5fdb871c5f9f36262af690233d

Merge branch 'master' into soc-2013-paint

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



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

diff --cc source/blender/blenkernel/BKE_paint.h
index 9d70917,0061280..c7211e3
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@@ -45,9 -45,9 +45,10 @@@ struct MultireModifierData
  struct MVert;
  struct Object;
  struct Paint;
 +struct PaintCurve;
  struct PBVH;
  struct Scene;
+ struct Sculpt;
  struct StrokeCache;
  struct Tex;
  struct ImagePool;
diff --cc source/blender/blenkernel/intern/paint.c
index f0df606,009e8cc..49de7db
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@@ -44,11 -45,10 +45,12 @@@
  #include "BLI_bitmap.h"
  #include "BLI_utildefines.h"
  #include "BLI_math_vector.h"
 +#include "BLI_listbase.h"
  
  #include "BKE_brush.h"
 +#include "BKE_main.h"
  #include "BKE_context.h"
+ #include "BKE_crazyspace.h"
  #include "BKE_depsgraph.h"
  #include "BKE_global.h"
  #include "BKE_image.h"
diff --cc source/blender/editors/include/ED_sculpt.h
index dfae9d2,8fcb228..768a0d7
--- a/source/blender/editors/include/ED_sculpt.h
+++ b/source/blender/editors/include/ED_sculpt.h
@@@ -46,18 -46,10 +46,11 @@@ void sculpt_get_redraw_planes(float pla
                                struct RegionView3D *rv3d, struct Object *ob);
  void ED_sculpt_get_average_stroke(struct Object *ob, float stroke[3]);
  bool ED_sculpt_minmax(struct bContext *C, float min[3], float max[3]);
- int ED_sculpt_mask_layers_ensure(struct Object *ob,
-                                   struct MultiresModifierData *mmd);
  int do_sculpt_mask_box_select(struct ViewContext *vc, struct rcti *rect, bool select, bool extend);
  
- enum {
- 	ED_SCULPT_MASK_LAYER_CALC_VERT = (1 << 0),
- 	ED_SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1)
- };
- 
  /* paint_ops.c */
  void ED_operatortypes_paint(void);
 +void ED_operatormacros_paint(void);
  void ED_keymap_paint(struct wmKeyConfig *keyconf);
  
  /* paint_undo.c */