Merge branch 'master' into soc-2013-paint

1 files changed, 15 insertions, 4 deletions

diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 9d70917815d..c7211e38994 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -48,6 +48,7 @@ struct Paint;
 struct PaintCurve;
 struct PBVH;
 struct Scene;
+struct Sculpt;
 struct StrokeCache;
 struct Tex;
 struct ImagePool;
@@ -196,8 +197,18 @@ typedef struct SculptSession {
 	int average_stroke_counter;
 } SculptSession;
 
-void free_sculptsession(struct Object *ob);
-void free_sculptsession_deformMats(struct SculptSession *ss);
-void sculptsession_bm_to_me(struct Object *ob, bool reorder);
-void sculptsession_bm_to_me_for_render(struct Object *object);
+void BKE_free_sculptsession(struct Object *ob);
+void BKE_free_sculptsession_deformMats(struct SculptSession *ss);
+void BKE_sculptsession_bm_to_me(struct Object *ob, bool reorder);
+void BKE_sculptsession_bm_to_me_for_render(struct Object *object);
+void BKE_sculpt_update_mesh_elements(struct Scene *scene, struct Sculpt *sd, struct Object *ob,
+								 bool need_pmap, bool need_mask);
+struct MultiresModifierData *BKE_sculpt_multires_active(struct Scene *scene, struct Object *ob);
+int BKE_sculpt_mask_layers_ensure(struct Object *ob,
+								  struct MultiresModifierData *mmd);
+
+enum {
+	SCULPT_MASK_LAYER_CALC_VERT = (1 << 0),
+	SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1)
+};
 #endif