Merging r55547 through r55594 from trunk into soc-2008-mxcurioni

4 files changed, 9 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 147791b4835..0c38adb3c83 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -56,6 +56,7 @@ typedef struct Brush {
 	struct BrushClone clone;
 	struct CurveMapping *curve; /* falloff curve */
 	struct MTex mtex;
+	struct MTex mask_mtex;
 
 	struct Brush *toggle_brush;
 
@@ -140,7 +141,8 @@ typedef enum BrushFlags {
 	/* temporary flag which sets up automatically for correct brush
 	 * drawing when inverted modal operator is running */
 	BRUSH_INVERTED = (1 << 29),
-	BRUSH_ABSOLUTE_JITTER = (1 << 30)
+	BRUSH_ABSOLUTE_JITTER = (1 << 30),
+	BRUSH_USE_MASK = (1 << 31)
 } BrushFlags;
 
 /* Brush.sculpt_tool */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index a106afd38b2..f9286052aeb 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -392,7 +392,9 @@ typedef struct RenderData {
 
 	short filtertype;	/* filter is box, tent, gauss, mitch, etc */
 
-	short size, maximsize;	/* size in %, max in Kb */
+	short size; /* size in % */
+	
+	short maximsize DNA_DEPRECATED; /* max in Kb */
 
 	short pad6;
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index b9c4788336f..1bc858f59f4 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -841,6 +841,8 @@ typedef enum eSpaceText_Flags {
 	ST_FIND_ALL             = (1 << 6),
 	ST_SHOW_MARGIN          = (1 << 7),
 	ST_MATCH_CASE           = (1 << 8),
+	
+	ST_FIND_ACTIVATE		= (1 << 9),
 } eSpaceText_Flags;
 
 /* stext->findstr/replacestr */
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index dd63e6aad59..afb2ac74d99 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -499,6 +499,7 @@ typedef struct ColorMapping {
 #define MTEX_MAP_MODE_TILED    1
 #define MTEX_MAP_MODE_3D       2
 #define MTEX_MAP_MODE_AREA     3
+#define MTEX_MAP_MODE_RANDOM   4
 
 /* **************** EnvMap ********************* */