- Imagepaint code cleanup:

- Move UVTEXTTOOL variables into global Gip struct (like Gvp for
    vertex paint). This will probably be moved into SpaceImage later,
    so it is saved with the .blend file.
  - Disable tool drawing. a better solution needs to be found.
  - Panel button layout is still the same, this will change.

- Removed the NAN_TPT define, it has no use anymore.

source/blender/include/BDR_imagepaint.h

@@ -1,4 +1,4 @@
-/*
+/**
  * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
@@ -28,14 +28,52 @@
  * Contributor(s): none yet.
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
- * Texture paint tool file dependency fix (and kludge)
  */
 
-#ifndef TPT_DEPENDKLUDGE_H
-#define TPT_DEPENDKLUDGE_H
+#ifndef BDR_IMAGEPAINT_H
+#define BDR_IMAGEPAINT_H
 
-#define NAN_TPT
-//#undef NAN_TPT
+/* ImagePaint.current */
+#define IMAGEPAINT_BRUSH 0
+#define IMAGEPAINT_AIRBRUSH 1
+#define IMAGEPAINT_SOFTEN 2
+#define IMAGEPAINT_AUX1 3
+#define IMAGEPAINT_AUX2 4
+#define IMAGEPAINT_SMEAR 5
+#define IMAGEPAINT_CLONE 6
+#define IMAGEPAINT_TOOL_SIZE 7
 
-#endif /* TPT_DEPENDKLUDGE_H */
+/* ImagePaint.flag */
+#define IMAGEPAINT_DRAW_TOOL 1
+#define IMAGEPAINT_DRAW_TOOL_DRAWING 2
+#define IMAGEPAINT_DRAWING 4
+#define IMAGEPAINT_TORUS 8
+#define IMAGEPAINT_TIMED 16
+
+typedef struct ImagePaintTool {
+	float rgba[4];
+	int size;
+	float innerradius;
+	float timing;
+} ImagePaintTool;
+
+typedef struct ImagePaint {
+	struct Clone {
+		Image *image;
+		float offset[2];
+		float alpha;
+	} clone;
+
+	ImagePaintTool tool[IMAGEPAINT_TOOL_SIZE];
+
+	short flag, current;
+} ImagePaint;
+
+extern struct ImagePaint Gip;
+
+void imagepaint_redraw_tool(void);
+void imagepaint_paint(short mousebutton);
+void imagepaint_pick(short mousebutton);
+
+#endif /*  BDR_IMAGEPAINT_H */
 

source/blender/include/BSE_trans_types.h

@@ -85,14 +85,5 @@ typedef struct VPaint {
 	short mode, flag;
 } VPaint;
 
-/*BM_TEXTUREPAINT */
-typedef struct BrushUIdata {
-	float r, g, b, a;
-	float size;		
-	float softradius;
-	float brushtiming;
-} BrushUIdata;
-#define PAINTPANELMESSAGEEATER 9000
-
 #endif /* BSE_TRANS_TYPES_H */
 

source/blender/include/blendef.h

@@ -301,6 +301,9 @@
 #define B_SIMAGEPAINTTOOL	362
 #define B_SIMAPACKIMA		363
 #define B_SIMAGESAVE		364
+#define B_SIMACLONEBROWSE	365
+#define B_SIMACLONEDELETE	366
+#define B_SIMABRUSHCHANGE	367
 
 /* BUTS: 400 */
 #define B_BUTSHOME		401