merge with/from trunk at r35190

1 files changed, 9 insertions, 4 deletions

diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index e2d48baba37..e6caae7a954 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -28,6 +28,10 @@
 #ifndef BKE_PAINT_H
 #define BKE_PAINT_H
 
+/** \file BKE_paint.h
+ *  \ingroup bke
+ */
+
 #include "DNA_vec_types.h"
 
 struct Brush;
@@ -78,8 +82,11 @@ typedef struct SculptSession {
 	/* PBVH acceleration structure */
 	struct PBVH *pbvh;
 
-	/* Used temporarily per-stroke */
-	float *vertexcosnos;
+	/* Paiting on deformed mesh */
+	int modifiers_active; /* object is deformed with some modifiers */
+	float (*orig_cos)[3]; /* coords of undeformed mesh */
+	float (*deform_cos)[3]; /* coords of deformed mesh but without stroke displacement */
+	float (*deform_imats)[3][3]; /* crazyspace deformation matricies */
 
 	/* Partial redraw */
 	int partial_redraw;
@@ -95,8 +102,6 @@ typedef struct SculptSession {
 
 	struct GPUDrawObject *drawobject;
 
-	int modifiers_active;
-
 	rcti previous_r;
 } SculptSession;