svn merge ^/trunk/blender -r43420:43436

5 files changed, 699 insertions, 466 deletions

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index af6f4b88f4b..98fe6e15e67 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,7 +42,7 @@ extern "C" {
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION			261
-#define BLENDER_SUBVERSION		2
+#define BLENDER_SUBVERSION		3
 
 #define BLENDER_MINVERSION		250
 #define BLENDER_MINSUBVERSION	0
diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index a951347d946..ffea8e0c8e2 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -46,6 +46,7 @@ void			free_text		(struct Text *text);
 void 			txt_set_undostate	(int u);
 int 			txt_get_undostate	(void);
 struct Text*	add_empty_text	(const char *name);
+int             txt_extended_ascii_as_utf8(char **str);
 int	            reopen_text		(struct Text *text);
 struct Text*	add_text		(const char *file, const char *relpath); 
 struct Text*	copy_text		(struct Text *ta);
@@ -59,6 +60,8 @@ void	txt_order_cursors	(struct Text *text);
 int		txt_find_string		(struct Text *text, const char *findstr, int wrap, int match_case);
 int		txt_has_sel			(struct Text *text);
 int		txt_get_span		(struct TextLine *from, struct TextLine *to);
+int     txt_utf8_offset_to_index(char *str, int offset);
+int     txt_utf8_index_to_offset(char *str, int index);
 void	txt_move_up			(struct Text *text, short sel);
 void	txt_move_down		(struct Text *text, short sel);
 void	txt_move_left		(struct Text *text, short sel);
@@ -86,9 +89,9 @@ void	txt_do_redo			(struct Text *text);
 void	txt_split_curline	(struct Text *text);
 void	txt_backspace_char	(struct Text *text);
 void	txt_backspace_word	(struct Text *text);
-int		txt_add_char		(struct Text *text, char add);
-int		txt_add_raw_char	(struct Text *text, char add);
-int		txt_replace_char	(struct Text *text, char add);
+int		txt_add_char		(struct Text *text, unsigned int add);
+int		txt_add_raw_char	(struct Text *text, unsigned int add);
+int		txt_replace_char	(struct Text *text, unsigned int add);
 void	txt_export_to_object(struct Text *text);
 void	txt_export_to_objects(struct Text *text);
 void	txt_unindent		(struct Text *text);
@@ -127,34 +130,48 @@ int text_check_whitespace(char ch);
 #define UNDO_SLEFT		005
 #define UNDO_SRIGHT		006
 #define UNDO_SUP		007
-#define UNDO_SDOWN		021
+#define UNDO_SDOWN		010
 
 /* Complex movement (opcode is followed
  * by 4 character line ID + a 2 character
  * position ID and opcode (repeat)) */
-#define UNDO_CTO		022
-#define UNDO_STO		023
-
-/* Complex editing (opcode is followed
- * by 1 character ID and opcode (repeat)) */
-#define UNDO_INSERT		024
-#define UNDO_BS			025
-#define UNDO_DEL		026
+#define UNDO_CTO		011
+#define UNDO_STO		012
+
+/* Complex editing */
+/* 1 - opcode is followed by 1 byte for ascii character and opcode (repeat)) */
+/* 2 - opcode is followed by 2 bytes for utf-8 character and opcode (repeat)) */
+/* 3 - opcode is followed by 3 bytes for utf-8 character and opcode (repeat)) */
+/* 4 - opcode is followed by 4 bytes for unicode character and opcode (repeat)) */
+#define UNDO_INSERT_1   013
+#define UNDO_INSERT_2   014
+#define UNDO_INSERT_3   015
+#define UNDO_INSERT_4   016
+
+#define UNDO_BS_1       017
+#define UNDO_BS_2       020
+#define UNDO_BS_3       021
+#define UNDO_BS_4       022
+
+#define UNDO_DEL_1      023
+#define UNDO_DEL_2      024
+#define UNDO_DEL_3      025
+#define UNDO_DEL_4      026
 
 /* Text block (opcode is followed
  * by 4 character length ID + the text
  * block itself + the 4 character length
  * ID (repeat) and opcode (repeat)) */
-#define UNDO_DBLOCK		027 /* Delete block */
-#define UNDO_IBLOCK		030 /* Insert block */
+#define UNDO_DBLOCK	    027 /* Delete block */
+#define UNDO_IBLOCK	    030 /* Insert block */
 
 /* Misc */
-#define UNDO_SWAP		031	/* Swap cursors */
+#define UNDO_SWAP       031	/* Swap cursors */
 
-#define UNDO_INDENT		032
-#define UNDO_UNINDENT		033
-#define UNDO_COMMENT		034
-#define UNDO_UNCOMMENT		035
+#define UNDO_INDENT     032
+#define UNDO_UNINDENT   033
+#define UNDO_COMMENT    034
+#define UNDO_UNCOMMENT  035
 
 /* Marker flags */
 #define TMARK_TEMP		0x01	/* Remove on non-editing events, don't save */
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index b7acede4b7b..944de316eb1 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -101,9 +101,10 @@ static int neighY[8] = {0,1,1, 1, 0,-1,-1,-1};
 #define EFF_MOVEMENT_PER_FRAME 0.05f
 /* initial wave time factor */
 #define WAVE_TIME_FAC (1.0f/24.f)
-#define WAVE_INIT_SIZE 5.0f
+#define CANVAS_REL_SIZE 5.0f
 /* drying limits */
 #define MIN_WETNESS 0.001f
+#define MAX_WETNESS 5.0f
 /* dissolve macro */
 #define VALUE_DISSOLVE(VALUE, TIME, SCALE, LOG) (VALUE) = (LOG) ? (VALUE) * (pow(MIN_WETNESS,1.0f/(1.2f*((float)(TIME))/(SCALE)))) : (VALUE) - 1.0f/(TIME)*(SCALE)
 
@@ -422,15 +423,31 @@ static void blendColors(float t_color[3], float t_alpha, float s_color[3], float
 	result[3] = f_alpha;
 }
 
-/* assumes source alpha > 0.0f or results NaN colors */
-static void mixColors(float *t_color, float t_alpha, float *s_color, float s_alpha)
+/* Mix two alpha weighed colors by a defined ratio. output is saved at a_color */
+static float mixColors(float a_color[3], float a_weight, float b_color[3], float b_weight, float ratio)
 {
-	float factor = (s_alpha<t_alpha) ? 1.0f : t_alpha/s_alpha;
+	float weight_ratio, factor;
+	if (b_weight) {
+		/* if first value has no weight just use b_color */
+		if (!a_weight) {
+			copy_v3_v3(a_color, b_color);
+			return b_weight*ratio;
+		}
+		weight_ratio = b_weight/(a_weight+b_weight);
+	}
+	else return a_weight*(1.0f-ratio);
 
-	/* set initial color depending on existing alpha */
-	interp_v3_v3v3(t_color, s_color, t_color, factor);
+	/* calculate final interpolation factor */
+	if (ratio<=0.5f) {
+		factor = weight_ratio*(ratio*2.0f);
+	}
+	else {
+		ratio = (ratio*2.0f - 1.0f);
+		factor = weight_ratio*(1.0f-ratio) + ratio;
+	}
 	/* mix final color */
-	interp_v3_v3v3(t_color, t_color, s_color, s_alpha);
+	interp_v3_v3v3(a_color, a_color, b_color, factor);
+	return (1.0f-factor)*a_weight + factor*b_weight;
 }
 
 /* set "ignore cache" flag for all caches on this object */
@@ -617,6 +634,12 @@ static void boundInsert(Bounds3D *b, float point[3])
 	}
 }
 
+float getSurfaceDimension(PaintSurfaceData *sData)
+{
+	Bounds3D *mb = &sData->bData->mesh_bounds;
+	return MAX3((mb->max[0]-mb->min[0]), (mb->max[1]-mb->min[1]), (mb->max[2]-mb->min[2]));
+}
+
 static void freeGrid(PaintSurfaceData *data)
 {
 	PaintBakeData *bData = data->bData;
@@ -959,17 +982,21 @@ struct DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSett
 
 	/* Set initial values */
 	surface->flags = MOD_DPAINT_ANTIALIAS | MOD_DPAINT_MULALPHA | MOD_DPAINT_DRY_LOG | MOD_DPAINT_DISSOLVE_LOG |
-					 MOD_DPAINT_ACTIVE | MOD_DPAINT_PREVIEW | MOD_DPAINT_OUT1;
+					 MOD_DPAINT_ACTIVE | MOD_DPAINT_PREVIEW | MOD_DPAINT_OUT1 | MOD_DPAINT_USE_DRYING;
 	surface->effect = 0;
 	surface->effect_ui = 1;
 
 	surface->diss_speed = 250;
 	surface->dry_speed = 500;
+	surface->color_dry_threshold = 1.0f;
 	surface->depth_clamp = 0.0f;
 	surface->disp_factor = 1.0f;
 	surface->disp_type = MOD_DPAINT_DISP_DISPLACE;
 	surface->image_fileformat = MOD_DPAINT_IMGFORMAT_PNG;
 
+	surface->influence_scale = 1.0f;
+	surface->radius_scale = 1.0f;
+
 	surface->init_color[0] = 1.0f;
 	surface->init_color[1] = 1.0f;
 	surface->init_color[2] = 1.0f;
@@ -1508,7 +1535,7 @@ static int dynamicPaint_checkSurfaceData(DynamicPaintSurface *surface)
 
 
 /* apply displacing vertex surface to the derived mesh */
-static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, DerivedMesh *result, int update_normals)
+static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, DerivedMesh *result)
 {
 	PaintSurfaceData *sData = surface->data;
 
@@ -1531,10 +1558,6 @@ static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, Deri
 			mvert[i].co[2] -= normal[2]*val;
 		}
 	}
-	else return;
-
-	if (update_normals)
-		CDDM_calc_normals_mapping(result);
 }
 
 /*
@@ -1549,6 +1572,7 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData
 	if(pmd->canvas && !(pmd->canvas->flags & MOD_DPAINT_BAKING)) {
 
 		DynamicPaintSurface *surface = pmd->canvas->surfaces.first;
+		int update_normals = 0;
 		pmd->canvas->flags &= ~MOD_DPAINT_PREVIEW_READY;
 
 		/* loop through surfaces */
@@ -1742,14 +1766,20 @@ static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData
 							normal_short_to_float_v3(normal, mvert[i].no);
 							madd_v3_v3fl(mvert[i].co, normal, wPoint[i].height);
 						}
-						CDDM_calc_normals_mapping(result);
+						update_normals = 1;
 					}
 
 					/* displace */
-					dynamicPaint_applySurfaceDisplace(surface, result, 1);
+					if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE) {
+						dynamicPaint_applySurfaceDisplace(surface, result);
+						update_normals = 1;
+					}
 				}
 			}
 		}
+
+		if (update_normals)
+			CDDM_calc_normals_mapping(result);
 	}
 	/* make a copy of dm to use as brush data */
 	if (pmd->brush) {
@@ -2568,14 +2598,8 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char* filenam
 			if (surface->type == MOD_DPAINT_SURFACE_T_PAINT) {
 				PaintPoint *point = &((PaintPoint*)sData->type_data)[index];
 
-				ibuf->rect_float[pos]   = point->color[0];
-				ibuf->rect_float[pos+1] = point->color[1];
-				ibuf->rect_float[pos+2] = point->color[2];
-				/* mix wet layer */
-				if (point->e_alpha) mixColors(&ibuf->rect_float[pos], point->alpha, point->e_color, point->e_alpha);
-
-				/* use highest alpha	*/
-				ibuf->rect_float[pos+3] = (point->e_alpha > point->alpha) ? point->e_alpha : point->alpha;
+				/* blend wet and dry layers */
+				blendColors(point->color, point->alpha, point->e_color, point->e_alpha, &ibuf->rect_float[pos]);
 
 				/* Multiply color by alpha if enabled	*/
 				if (surface->flags & MOD_DPAINT_MULALPHA) {
@@ -2906,7 +2930,13 @@ static void dynamicPaint_updatePointData(DynamicPaintSurface *surface, unsigned
 										 float paint[3], float influence, float depth, float vel_factor, float timescale)
 {
 		PaintSurfaceData *sData = surface->data;
-		float strength = influence * brush->alpha;
+		float strength;
+
+		/* apply influence scale */
+		influence *= surface->influence_scale;
+		depth *= surface->influence_scale;
+
+		strength = influence * brush->alpha;
 		CLAMP(strength, 0.0f, 1.0f);
 
 		/* Sample velocity colorband if required */
@@ -2985,12 +3015,12 @@ static void dynamicPaint_updatePointData(DynamicPaintSurface *surface, unsigned
 }
 
 /* checks whether surface and brush bounds intersect depending on brush type */
-static int meshBrush_boundsIntersect(Bounds3D *b1, Bounds3D *b2, DynamicPaintBrushSettings *brush)
+static int meshBrush_boundsIntersect(Bounds3D *b1, Bounds3D *b2, DynamicPaintBrushSettings *brush, float brush_radius)
 {
 	if (brush->collision == MOD_DPAINT_COL_VOLUME)
 		return boundsIntersect(b1, b2);
 	else if (brush->collision == MOD_DPAINT_COL_DIST || brush->collision == MOD_DPAINT_COL_VOLDIST)
-		return boundsIntersectDist(b1, b2, brush->paint_distance);
+		return boundsIntersectDist(b1, b2, brush_radius);
 	else return 1;
 }
 
@@ -3117,6 +3147,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 	{
 		BVHTreeFromMesh treeData = {0};
 		float avg_brushNor[3] = {0.0f};
+		float brush_radius = brush->paint_distance * surface->radius_scale;
 		int numOfVerts;
 		int ii;
 		Bounds3D mesh_bb = {0};
@@ -3155,7 +3186,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 		}
 
 		/* check bounding box collision */
-		if(grid && meshBrush_boundsIntersect(&grid->grid_bounds, &mesh_bb, brush))
+		if(grid && meshBrush_boundsIntersect(&grid->grid_bounds, &mesh_bb, brush, brush_radius))
 		/* Build a bvh tree from transformed vertices	*/
 		if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 8))
 		{
@@ -3167,7 +3198,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 				int id;
 
 				/* check grid cell bounding box */
-				if (!grid->s_num[c_index] || !meshBrush_boundsIntersect(&grid->bounds[c_index], &mesh_bb, brush))
+				if (!grid->s_num[c_index] || !meshBrush_boundsIntersect(&grid->bounds[c_index], &mesh_bb, brush, brush_radius))
 					continue;
 
 				/* loop through cell points and process brush */
@@ -3228,7 +3259,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 						hit.index = -1;
 						hit.dist = 9999;
 						nearest.index = -1;
-						nearest.dist = brush->paint_distance * brush->paint_distance; /* find_nearest uses squared distance */
+						nearest.dist = brush_radius * brush_radius; /* find_nearest uses squared distance */
 
 						/* Check volume collision	*/
 						if (brush->collision == MOD_DPAINT_COL_VOLUME || brush->collision == MOD_DPAINT_COL_VOLDIST)
@@ -3288,7 +3319,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 							/* If pure distance proximity, find the nearest point on the mesh */
 							if (brush->collision != MOD_DPAINT_COL_DIST || !(brush->flags & MOD_DPAINT_PROX_PROJECT)) {
 								if (BLI_bvhtree_find_nearest(treeData.tree, ray_start, &nearest, mesh_faces_nearest_point_dp, &treeData) != -1) {
-									proxDist = sqrt(nearest.dist);
+									proxDist = sqrtf(nearest.dist);
 									copy_v3_v3(hitCo, nearest.co);
 									hQuad = (nearest.no[0] == 1.0f);
 									face = nearest.index;
@@ -3308,7 +3339,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 									proj_ray[2] = 1.0f;
 								}
 								hit.index = -1;
-								hit.dist = brush->paint_distance;
+								hit.dist = brush_radius;
 
 								/* Do a face normal directional raycast, and use that distance	*/
 								if(BLI_bvhtree_ray_cast(treeData.tree, ray_start, proj_ray, 0.0f, &hit, mesh_faces_spherecast_dp, &treeData) != -1)
@@ -3321,8 +3352,8 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 							}
 
 							/* If a hit was found, calculate required values	*/
-							if (proxDist >= 0.0f && proxDist <= brush->paint_distance) {
-								proximity_factor = proxDist / brush->paint_distance;
+							if (proxDist >= 0.0f && proxDist <= brush_radius) {
+								proximity_factor = proxDist / brush_radius;
 								CLAMP(proximity_factor, 0.0f, 1.0f);
 								if (!inner_proximity)
 									proximity_factor = 1.0f - proximity_factor;
@@ -3508,8 +3539,8 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
 	int invalidParticles = 0;
 	int p = 0;
 
-	float solidradius = (brush->flags & MOD_DPAINT_PART_RAD) ? psys->part->size : brush->particle_radius;
-	float smooth = brush->particle_smooth;
+	float solidradius = surface->radius_scale*((brush->flags & MOD_DPAINT_PART_RAD) ? psys->part->size : brush->particle_radius);
+	float smooth = brush->particle_smooth*surface->radius_scale;
 
 	float range = solidradius + smooth;
 	float particle_timestep = 0.04f * part->timetweak;
@@ -3738,6 +3769,7 @@ static int dynamicPaint_paintSinglePoint(DynamicPaintSurface *surface, float *po
                                          Object *brushOb, BrushMaterials *bMats, Scene *scene, float timescale)
 {
 	int index;
+	float brush_radius = brush->paint_distance * surface->radius_scale;
 	PaintSurfaceData *sData = surface->data;
 	PaintBakeData *bData = sData->bData;
 	Vec3f brushVel;
@@ -3755,13 +3787,13 @@ static int dynamicPaint_paintSinglePoint(DynamicPaintSurface *surface, float *po
 		float colorband[4] = {0.0f};
 		float strength;
 
-		if (distance>brush->paint_distance) continue;
+		if (distance > brush_radius) continue;
 
 		/* Smooth range or color ramp	*/
 		if (brush->proximity_falloff == MOD_DPAINT_PRFALL_SMOOTH ||
 			brush->proximity_falloff == MOD_DPAINT_PRFALL_RAMP) {
 			
-			strength = 1.0f - distance / brush->paint_distance;
+			strength = 1.0f - distance / brush_radius;
 			CLAMP(strength, 0.0f, 1.0f);
 		}
 		else strength = 1.0f;
@@ -3826,8 +3858,8 @@ static int dynamicPaint_paintSinglePoint(DynamicPaintSurface *surface, float *po
 			else if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE ||
 					 surface->type == MOD_DPAINT_SURFACE_T_WAVE) {
 				 /* get displace depth	*/
-				float disp_intersect = (1.0f - sqrtf((brush->paint_distance-distance) / brush->paint_distance)) * brush->paint_distance;
-				depth = (brush->paint_distance - disp_intersect) / bData->bNormal[index].normal_scale;
+				float disp_intersect = (1.0f - sqrtf((brush_radius-distance) / brush_radius)) * brush_radius;
+				depth = (brush_radius - disp_intersect) / bData->bNormal[index].normal_scale;
 				if (depth<0.0f) depth = 0.0f;
 			}
 			dynamicPaint_updatePointData(surface, index, brush, paintColor, strength, depth, velocity_val, timescale);
@@ -3930,7 +3962,7 @@ void surface_determineForceTargetPoints(PaintSurfaceData *sData, int index, floa
 	if (closest_id[1] != -1) {
 		float force_proj[3];
 		float tangent[3];
-		float neigh_diff = acos(dot_v3v3(bNeighs[closest_id[0]].dir, bNeighs[closest_id[1]].dir));
+		float neigh_diff = acosf(dot_v3v3(bNeighs[closest_id[0]].dir, bNeighs[closest_id[1]].dir));
 		float force_intersect;
 		float temp;
 
@@ -4002,7 +4034,6 @@ static void dynamicPaint_doSmudge(DynamicPaintSurface *surface, DynamicPaintBrus
 				if (n_index != -1 && closest_d[i]>0.0f) {
 					float dir_dot = closest_d[i], dir_factor;
 					float speed_scale = eff_scale*smudge_str/bNeighs[n_index].dist;
-					float mix;
 					PaintPoint *ePoint = &((PaintPoint*)sData->type_data)[sData->adj_data->n_target[n_index]];
 
 					/* just skip if angle is too extreme */
@@ -4012,13 +4043,11 @@ static void dynamicPaint_doSmudge(DynamicPaintSurface *surface, DynamicPaintBrus
 					if (dir_factor > brush->smudge_strength) dir_factor = brush->smudge_strength;
 
 					/* mix new color and alpha */
-					mix = dir_factor*pPoint->alpha;
-					if (mix) mixColors(ePoint->color, ePoint->alpha, pPoint->color, mix);
+					mixColors(ePoint->color, ePoint->alpha, pPoint->color, pPoint->alpha, dir_factor);
 					ePoint->alpha = ePoint->alpha*(1.0f-dir_factor) + pPoint->alpha*dir_factor;
 
 					/* smudge "wet layer" */
-					mix = dir_factor*pPoint->e_alpha;
-					if (mix) mixColors(ePoint->e_color, ePoint->e_alpha, pPoint->e_color, mix);
+					mixColors(ePoint->e_color, ePoint->e_alpha, pPoint->e_color, pPoint->e_alpha, dir_factor);
 					ePoint->e_alpha = ePoint->e_alpha*(1.0f-dir_factor) + pPoint->e_alpha*dir_factor;
 					pPoint->wetness *= (1.0f-dir_factor);
 				}
@@ -4035,7 +4064,7 @@ static int dynamicPaint_prepareEffectStep(DynamicPaintSurface *surface, Scene *s
 {
 	double average_force = 0.0f;
 	float shrink_speed=0.0f, spread_speed=0.0f;
-	float fastest_effect;
+	float fastest_effect, avg_dist;
 	int steps;
 	PaintSurfaceData *sData = surface->data;
 	PaintBakeData *bData = sData->bData;
@@ -4112,9 +4141,10 @@ static int dynamicPaint_prepareEffectStep(DynamicPaintSurface *surface, Scene *s
 		shrink_speed = surface->shrink_speed;
 
 	fastest_effect = MAX3(spread_speed, shrink_speed, average_force);
+	avg_dist = bData->average_dist*CANVAS_REL_SIZE/getSurfaceDimension(sData);
 
-	steps = (int)ceil(1.5f*EFF_MOVEMENT_PER_FRAME*fastest_effect/bData->average_dist*timescale);
-	CLAMP(steps, 1, 14);
+	steps = (int)ceil(1.5f*EFF_MOVEMENT_PER_FRAME*fastest_effect/avg_dist*timescale);
+	CLAMP(steps, 1, 20);
 
 	return steps;
 }
@@ -4126,6 +4156,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
 {
 	PaintSurfaceData *sData = surface->data;
 	BakeNeighPoint *bNeighs = sData->bData->bNeighs;
+	float distance_scale = getSurfaceDimension(sData)/CANVAS_REL_SIZE;
 	int index;
 	timescale /= steps;
 
@@ -4135,7 +4166,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
 	*	Spread Effect
 	*/
 	if (surface->effect & MOD_DPAINT_EFFECT_DO_SPREAD)  {
-		float eff_scale = EFF_MOVEMENT_PER_FRAME*surface->spread_speed*timescale;
+		float eff_scale = distance_scale*EFF_MOVEMENT_PER_FRAME*surface->spread_speed*timescale;
 
 		/* Copy current surface to the previous points array to read unmodified values	*/
 		memcpy(prevPoint, sData->type_data, sData->total_points*sizeof(struct PaintPoint));
@@ -4145,7 +4176,6 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
 		{
 			int i;
 			int numOfNeighs = sData->adj_data->n_num[index];
-			float totalAlpha = 0.0f;
 			PaintPoint *pPoint = &((PaintPoint*)sData->type_data)[index];
 
 			/*  Only reads values from the surface copy (prevPoint[]),
@@ -4154,39 +4184,23 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
 			/*	Loop through neighbouring points	*/
 			for (i=0; i<numOfNeighs; i++) {
 				int n_index = sData->adj_data->n_index[index]+i;
-				float w_factor, alphaAdd = 0.0f;
+				float w_factor /* , p_alpha = pPoint->e_alpha */ /* UNUSED */;
 				PaintPoint *ePoint = &prevPoint[sData->adj_data->n_target[n_index]];
 				float speed_scale = (bNeighs[n_index].dist<eff_scale) ? 1.0f : eff_scale/bNeighs[n_index].dist;
-				float color_mix = (MIN2(ePoint->wetness, pPoint->wetness))*0.25f*surface->color_spread_speed;
-
-				totalAlpha += ePoint->e_alpha;
+				float color_mix = (MIN3(ePoint->wetness, pPoint->wetness, 1.0f))*0.25f*surface->color_spread_speed;
 
 				/* do color mixing */
-				if (color_mix > MIN_WETNESS) mixColors(pPoint->e_color, pPoint->e_alpha, ePoint->e_color, color_mix);
-
-				/* Check if neighbouring point has higher wetness,
-				*  if so, add it's wetness to this point as well*/
-				if (ePoint->wetness <= pPoint->wetness) continue;
-				w_factor = ePoint->wetness/numOfNeighs * (ePoint->wetness - pPoint->wetness) * speed_scale;
-				if (w_factor <= MIN_WETNESS) continue;
-
-				if (ePoint->e_alpha > pPoint->e_alpha) {
-					alphaAdd = ePoint->e_alpha/numOfNeighs * (ePoint->wetness*ePoint->e_alpha - pPoint->wetness*pPoint->e_alpha) * speed_scale;
-				}
-
-				/* mix new color */
-				mixColors(pPoint->e_color, pPoint->e_alpha, ePoint->e_color, w_factor);
+				if (color_mix) mixColors(pPoint->e_color, pPoint->e_alpha, ePoint->e_color, ePoint->e_alpha, color_mix);
 
-				pPoint->e_alpha += alphaAdd;
-				pPoint->wetness += w_factor;
+				/* Only continue if surrounding point has higher wetness */
+				if (ePoint->wetness<pPoint->wetness || ePoint->wetness<MIN_WETNESS) continue;
 
-				if (pPoint->e_alpha > 1.0f) pPoint->e_alpha = 1.0f;
-			}
+				w_factor = 1.0f/numOfNeighs * MIN2(ePoint->wetness, 1.0f) * speed_scale;
+				CLAMP(w_factor, 0.0f, 1.0f);
 
-			/* For antialiasing sake, don't let alpha go much higher than average alpha of neighbours	*/
-			if (pPoint->e_alpha > (totalAlpha/numOfNeighs+0.25f)) {
-				pPoint->e_alpha = (totalAlpha/numOfNeighs+0.25f);
-				if (pPoint->e_alpha>1.0f) pPoint->e_alpha = 1.0f;
+				/* mix new wetness and color */
+				pPoint->wetness = (1.0f-w_factor)*pPoint->wetness + w_factor*ePoint->wetness;
+				pPoint->e_alpha = mixColors(pPoint->e_color, pPoint->e_alpha, ePoint->e_color, ePoint->e_alpha, w_factor);
 			}
 		}
 	}
@@ -4195,7 +4209,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
 	*	Shrink Effect
 	*/
 	if (surface->effect & MOD_DPAINT_EFFECT_DO_SHRINK)  {
-		float eff_scale = EFF_MOVEMENT_PER_FRAME*surface->shrink_speed*timescale;
+		float eff_scale = distance_scale*EFF_MOVEMENT_PER_FRAME*surface->shrink_speed*timescale;
 
 		/* Copy current surface to the previous points array to read unmodified values	*/
 		memcpy(prevPoint, sData->type_data, sData->total_points*sizeof(struct PaintPoint));
@@ -4245,7 +4259,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
 	*/
 	if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP && force) 
 	{
-		float eff_scale = EFF_MOVEMENT_PER_FRAME*timescale/2.0f;
+		float eff_scale = distance_scale*EFF_MOVEMENT_PER_FRAME*timescale/2.0f;
 		/* Copy current surface to the previous points array to read unmodified values	*/
 		memcpy(prevPoint, sData->type_data, sData->total_points*sizeof(struct PaintPoint));
 
@@ -4258,8 +4272,9 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
 			float closest_d[2];
 
 			/* adjust drip speed depending on wetness */
-			float w_factor = pPoint_prev->wetness*0.5f - 0.025f;
+			float w_factor = pPoint_prev->wetness - 0.025f;
 			if (w_factor <= 0) continue;
+			CLAMP(w_factor, 0.0f, 1.0f);
 
 			/* get force affect points */
 			surface_determineForceTargetPoints(sData, index, &force[index*4], closest_d, closest_id);
@@ -4268,41 +4283,38 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
 			for (i=0; i<2; i++) {
 				int n_index = closest_id[i];
 				if (n_index != -1 && closest_d[i]>0.0f) {
-					float dir_dot = closest_d[i], dir_factor;
+					float dir_dot = closest_d[i], dir_factor, a_factor;
 					float speed_scale = eff_scale*force[index*4+3]/bNeighs[n_index].dist;
 					PaintPoint *ePoint = &((PaintPoint*)sData->type_data)[sData->adj_data->n_target[n_index]];
+					float e_wet = ePoint->wetness;
 
 					/* just skip if angle is too extreme */
 					if (dir_dot <= 0.0f) continue;
 
-					dir_factor = dir_dot * speed_scale * w_factor;
-					if (dir_factor > (0.5f/steps)) dir_factor = (0.5f/steps);
-
-					/* mix new color */
-					if (dir_factor) mixColors(ePoint->e_color, ePoint->e_alpha, pPoint->e_color, dir_factor);
+					dir_factor = dir_dot * MIN2(speed_scale, 1.0f) * w_factor;
+					if (dir_factor > 0.5f) dir_factor = 0.5f;
 
-					ePoint->e_alpha += dir_factor;
+					/* mix new wetness*/
 					ePoint->wetness += dir_factor;
-					if (ePoint->e_alpha > 1.0f) ePoint->e_alpha = 1.0f;
+					CLAMP(ePoint->wetness, 0.0f, MAX_WETNESS);
+
+					/* mix new color */
+					a_factor = dir_factor / pPoint_prev->wetness;
+					CLAMP(a_factor, 0.0f, 1.0f);
+					mixColors(ePoint->e_color, ePoint->e_alpha, pPoint_prev->e_color, pPoint_prev->e_alpha, a_factor);
+					/* dripping is supposed to preserve alpha level */
+					if (pPoint_prev->e_alpha > ePoint->e_alpha) {
+						ePoint->e_alpha += a_factor * pPoint_prev->e_alpha;
+						if (ePoint->e_alpha > pPoint_prev->e_alpha)
+							ePoint->e_alpha = pPoint_prev->e_alpha;
+					}
 
-					/* and decrease paint wetness on current point */
-					pPoint->wetness -= dir_factor;
+					/* decrease paint wetness on current point */
+					pPoint->wetness -= (ePoint->wetness - e_wet);
+					CLAMP(pPoint->wetness, 0.0f, MAX_WETNESS);
 				}
 			}
 		}
-
-		/* Keep values within acceptable range */
-		#pragma omp parallel for schedule(static)
-		for (index = 0; index < sData->total_points; index++)
-		{
-			PaintPoint *cPoint = &((PaintPoint*)sData->type_data)[index];
-
-			if (cPoint->e_alpha > 1.0f) cPoint->e_alpha=1.0f;
-			if (cPoint->wetness > 2.0f) cPoint->wetness=2.0f;
-
-			if (cPoint->e_alpha < 0.0f) cPoint->e_alpha=0.0f;
-			if (cPoint->wetness < 0.0f) cPoint->wetness=0.0f;
-		}
 	}
 }
 
@@ -4317,7 +4329,7 @@ void dynamicPaint_doWaveStep(DynamicPaintSurface *surface, float timescale)
 	double average_dist = 0.0f;
 	Bounds3D *mb = &sData->bData->mesh_bounds;
 	float canvas_size = MAX3((mb->max[0]-mb->min[0]), (mb->max[1]-mb->min[1]), (mb->max[2]-mb->min[2]));
-	float wave_scale = WAVE_INIT_SIZE/canvas_size;
+	float wave_scale = CANVAS_REL_SIZE/canvas_size;
 
 	/* allocate memory */
 	PaintWavePoint *prevPoint = MEM_mallocN(sData->total_points*sizeof(PaintWavePoint), "Temp previous points for wave simulation");
@@ -4430,48 +4442,53 @@ static void dynamicPaint_surfacePreStep(DynamicPaintSurface *surface, float time
 		if (surface->type == MOD_DPAINT_SURFACE_T_PAINT) {
 			PaintPoint *pPoint = &((PaintPoint*)sData->type_data)[index];
 			/* drying */
-			if (pPoint->wetness >= MIN_WETNESS) {
-				int i;
-				float dry_ratio, f_color[4];
-				float p_wetness = pPoint->wetness;
-				VALUE_DISSOLVE(pPoint->wetness, surface->dry_speed, timescale, (surface->flags & MOD_DPAINT_DRY_LOG));
-				if (pPoint->wetness<0.0f) pPoint->wetness=0.0f;
-				dry_ratio = pPoint->wetness/p_wetness;
+			if (surface->flags & MOD_DPAINT_USE_DRYING) {
+				if (pPoint->wetness >= MIN_WETNESS) {
+					int i;
+					float dry_ratio, f_color[4];
+					float p_wetness = pPoint->wetness;
+					VALUE_DISSOLVE(pPoint->wetness, surface->dry_speed, timescale, (surface->flags & MOD_DPAINT_DRY_LOG));
+					if (pPoint->wetness<0.0f) pPoint->wetness=0.0f;
 
-				/*
-				*	Slowly "shift" paint from wet layer to dry layer as it drys:
-				*/
-				/* make sure alpha values are within proper range */
-				CLAMP(pPoint->alpha, 0.0f, 1.0f);
-				CLAMP(pPoint->e_alpha, 0.0f, 1.0f);
-
-				/* get current final blended color of these layers */
-				blendColors(pPoint->color, pPoint->alpha, pPoint->e_color, pPoint->e_alpha, f_color);
-				/* reduce wet layer alpha by dry factor */
-				pPoint->e_alpha *= dry_ratio;
-
-				/* now calculate new alpha for dry layer that keeps final blended color unchanged */
-				pPoint->alpha = (f_color[3] - pPoint->e_alpha)/(1.0f-pPoint->e_alpha);
-				/* for each rgb component, calculate a new dry layer color that keeps the final blend color
-				*  with these new alpha values. (wet layer color doesnt change)*/
-				if (pPoint->alpha) {
-					for (i=0; i<3; i++) {
-						pPoint->color[i] = (f_color[i]*f_color[3] - pPoint->e_color[i]*pPoint->e_alpha)/(pPoint->alpha*(1.0f-pPoint->e_alpha));
+					if (pPoint->wetness < surface->color_dry_threshold) {
+						dry_ratio = pPoint->wetness/p_wetness;
+
+						/*
+						*	Slowly "shift" paint from wet layer to dry layer as it drys:
+						*/
+						/* make sure alpha values are within proper range */
+						CLAMP(pPoint->alpha, 0.0f, 1.0f);
+						CLAMP(pPoint->e_alpha, 0.0f, 1.0f);
+
+						/* get current final blended color of these layers */
+						blendColors(pPoint->color, pPoint->alpha, pPoint->e_color, pPoint->e_alpha, f_color);
+						/* reduce wet layer alpha by dry factor */
+						pPoint->e_alpha *= dry_ratio;
+
+						/* now calculate new alpha for dry layer that keeps final blended color unchanged */
+						pPoint->alpha = (f_color[3] - pPoint->e_alpha)/(1.0f-pPoint->e_alpha);
+						/* for each rgb component, calculate a new dry layer color that keeps the final blend color
+						*  with these new alpha values. (wet layer color doesnt change)*/
+						if (pPoint->alpha) {
+							for (i=0; i<3; i++) {
+								pPoint->color[i] = (f_color[i]*f_color[3] - pPoint->e_color[i]*pPoint->e_alpha)/(pPoint->alpha*(1.0f-pPoint->e_alpha));
+							}
+						}
 					}
-				}
 
-				pPoint->state = DPAINT_PAINT_WET;
-			}
-			/* in case of just dryed paint, just mix it to the dry layer and mark it empty */
-			else if (pPoint->state > 0) {
-				float f_color[4];
-				blendColors(pPoint->color, pPoint->alpha, pPoint->e_color, pPoint->e_alpha, f_color);
-				copy_v3_v3(pPoint->color, f_color);
-				pPoint->alpha = f_color[3];
-				/* clear wet layer */
-				pPoint->wetness = 0.0f;
-				pPoint->e_alpha = 0.0f;
-				pPoint->state = DPAINT_PAINT_DRY;
+					pPoint->state = DPAINT_PAINT_WET;
+				}
+				/* in case of just dryed paint, just mix it to the dry layer and mark it empty */
+				else if (pPoint->state > 0) {
+					float f_color[4];
+					blendColors(pPoint->color, pPoint->alpha, pPoint->e_color, pPoint->e_alpha, f_color);
+					copy_v3_v3(pPoint->color, f_color);
+					pPoint->alpha = f_color[3];
+					/* clear wet layer */
+					pPoint->wetness = 0.0f;
+					pPoint->e_alpha = 0.0f;
+					pPoint->state = DPAINT_PAINT_DRY;
+				}
 			}
 
 			if (surface->flags & MOD_DPAINT_DISSOLVE) {
@@ -4919,7 +4936,7 @@ int dynamicPaint_calculateFrame(DynamicPaintSurface *surface, Scene *scene, Obje
 
 	/* apply previous displace on derivedmesh if incremental surface */
 	if (surface->flags & MOD_DPAINT_DISP_INCREMENTAL)
-		dynamicPaint_applySurfaceDisplace(surface, surface->canvas->dm, 0);
+		dynamicPaint_applySurfaceDisplace(surface, surface->canvas->dm);
 
 	/* update bake data */
 	dynamicPaint_generateBakeData(surface, scene, cObject); 
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 8d20a06d009..46a3f776e43 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3468,7 +3468,7 @@ static void makelatticesprings(Lattice *lt,	BodySpring *bs, int dostiff,Object *
 							bs->len= globallen((bp-dw-dv-1)->vec, bp->vec,ob);
 							bs++;
 						}
-						if( (v < lt->pntsv-1) && (u) ) {
+						if( (v < lt->pntsv-1) && (u != 0) ) {
 							bs->v1 = bpc;
 							bs->v2 = bpc-dw+dv-1;
 							bs->springtype=SB_BEND;
@@ -3485,7 +3485,7 @@ static void makelatticesprings(Lattice *lt,	BodySpring *bs, int dostiff,Object *
 							bs->len= globallen((bp+dw-dv-1)->vec, bp->vec,ob);
 							bs++;
 						}
-						if( (v < lt->pntsv-1) && (u) ) {
+						if( (v < lt->pntsv-1) && (u != 0) ) {
 							bs->v1 = bpc;
 							bs->v2 = bpc+dw+dv-1;
 							bs->springtype=SB_BEND;
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 7e102bc9854..bc86a53c35e 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -33,6 +33,8 @@
 #include <string.h> /* strstr */
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include "MEM_guardedalloc.h"
 
@@ -215,8 +217,48 @@ Text *add_empty_text(const char *name)
 	return ta;
 }
 
+/* this function replaces extended ascii characters */
+/* to a valid utf-8 sequences */
+int txt_extended_ascii_as_utf8(char **str)
+{
+	int bad_char, added= 0, i= 0;
+	int length = strlen(*str);
+
+	while ((*str)[i]) {
+		if((bad_char= BLI_utf8_invalid_byte(*str+i, length)) == -1)
+		    break;
+
+		added++;
+		i+= bad_char + 1;
+	}
+	
+	if (added != 0) {
+		char *newstr = MEM_mallocN(length+added+1, "text_line");
+		int mi = 0;
+		i= 0;
+		
+		while ((*str)[i]) {
+			if((bad_char= BLI_utf8_invalid_byte((*str)+i, length)) == -1) {
+				memcpy(newstr+mi, (*str)+i, length - i + 1);
+				break;
+			}
+			
+			memcpy(newstr+mi, (*str)+i, bad_char);
+
+			BLI_str_utf8_from_unicode((*str)[i+bad_char], newstr+mi+bad_char);
+			i+= bad_char+1;
+			mi+= bad_char+2;
+		}
+		newstr[length+added] = '\0';
+		MEM_freeN(*str);
+		*str = newstr;
+	}
+	
+	return added;
+}
+
 // this function removes any control characters from
-// a textline
+// a textline and fixes invalid utf-8 sequences
 
 static void cleanup_textline(TextLine * tl)
 {
@@ -229,6 +271,7 @@ static void cleanup_textline(TextLine * tl)
 			i--;
 		}
 	}
+	tl->len+= txt_extended_ascii_as_utf8(&tl->line);
 }
 
 int reopen_text(Text *text)
@@ -689,16 +732,10 @@ static void txt_make_dirty (Text *text)
 }
 
 /* 0:whitespace, 1:punct, 2:alphanumeric */
-static short txt_char_type (char ch)
-{
-	if (ch <= ' ') return 0; /* 32 */
-	if (ch <= '/') return 1; /* 47 */
-	if (ch <= '9') return 2; /* 57 */
-	if (ch <= '@') return 1; /* 64 */
-	if (ch <= 'Z') return 2; /* 90 */
-	if (ch == '_') return 2; /* 95, dont delimit '_' */
-	if (ch <= '`') return 1; /* 96 */
-	if (ch <= 'z') return 2; /* 122 */
+static short txt_char_type(unsigned int ch)
+{
+	if (iswspace(ch)) return 0;
+	if (iswalpha(ch) || iswdigit(ch)) return 2;
 	return 1;
 }
 
@@ -731,9 +768,42 @@ static void txt_curs_first (Text *text, TextLine **linep, int *charp)
 	}
 }
 
-/****************************/
+/*****************************/
 /* Cursor movement functions */
-/****************************/
+/*****************************/
+
+int txt_utf8_offset_to_index(char *str, int offset)
+{
+	int index= 0, pos= 0;
+	while (pos != offset) {
+		pos += BLI_str_utf8_size(str + pos);
+		index++;
+	}
+	return index;
+}
+
+int txt_utf8_index_to_offset(char *str, int index)
+{
+	int offset= 0, pos= 0;
+	while (pos != index) {
+		offset += BLI_str_utf8_size(str + offset);
+		pos++;
+	}
+	return offset;
+}
+
+/* returns the real number of characters in string */
+/* not the same as BLI_strlen_utf8, which returns length for wide characters */
+static int txt_utf8_len(const char *src)
+{
+	int len;
+
+	for (len=0; *src; len++) {
+		src += BLI_str_utf8_size(src);
+	}
+
+	return len;
+}
 
 void txt_move_up(Text *text, short sel)
 {
@@ -747,13 +817,13 @@ void txt_move_up(Text *text, short sel)
 	old= *charp;
 
 	if((*linep)->prev) {
+		int index = txt_utf8_offset_to_index((*linep)->line, *charp);
 		*linep= (*linep)->prev;
-		if (*charp > (*linep)->len) {
-			*charp= (*linep)->len;
-			if(!undoing) txt_undo_add_toop(text, sel?UNDO_STO:UNDO_CTO, txt_get_span(text->lines.first, (*linep)->next), old, txt_get_span(text->lines.first, *linep), (unsigned short) *charp);
-		} else {
-			if(!undoing) txt_undo_add_op(text, sel?UNDO_SUP:UNDO_CUP);
-		}
+		if (index > txt_utf8_len((*linep)->line)) *charp= (*linep)->len;
+		else *charp= txt_utf8_index_to_offset((*linep)->line, index);
+		
+		if(!undoing)
+			txt_undo_add_op(text, sel?UNDO_SUP:UNDO_CUP);
 	} else {
 		txt_move_bol(text, sel);
 	}
@@ -773,12 +843,13 @@ void txt_move_down(Text *text, short sel)
 	old= *charp;
 
 	if((*linep)->next) {
+		int index = txt_utf8_offset_to_index((*linep)->line, *charp);
 		*linep= (*linep)->next;
-		if (*charp > (*linep)->len) {
-			*charp= (*linep)->len;
-			if(!undoing) txt_undo_add_toop(text, sel?UNDO_STO:UNDO_CTO, txt_get_span(text->lines.first, (*linep)->prev), old, txt_get_span(text->lines.first, *linep), (unsigned short)*charp);
-		} else
-			if(!undoing) txt_undo_add_op(text, sel?UNDO_SDOWN:UNDO_CDOWN);	
+		if (index > txt_utf8_len((*linep)->line)) *charp= (*linep)->len;
+		else *charp= txt_utf8_index_to_offset((*linep)->line, index);
+		
+		if(!undoing)
+			txt_undo_add_op(text, sel?UNDO_SDOWN:UNDO_CDOWN);
 	} else {
 		txt_move_eol(text, sel);
 	}
@@ -790,7 +861,7 @@ void txt_move_left(Text *text, short sel)
 {
 	TextLine **linep;
 	int *charp, oundoing= undoing;
-	int tabsize = 1, i=0;
+	int tabsize= 0, i= 0;
 	
 	if (!text) return;
 	if(sel) txt_curs_sel(text, &linep, &charp);
@@ -799,32 +870,36 @@ void txt_move_left(Text *text, short sel)
 
 	undoing= 1;
 
-	// do nice left only if there are only spaces
-	// TXT_TABSIZE hardcoded in DNA_text_types.h
-	if (text->flags & TXT_TABSTOSPACES) {
-		tabsize = TXT_TABSIZE;
-
-		if (*charp < tabsize)
-			tabsize = *charp;
-		else {
-			for (i=0;i<(*charp);i++)
+	if (*charp== 0) {
+		if ((*linep)->prev) {
+			txt_move_up(text, sel);
+			*charp= (*linep)->len;
+		}
+	}
+	else {
+		// do nice left only if there are only spaces
+		// TXT_TABSIZE hardcoded in DNA_text_types.h
+		if (text->flags & TXT_TABSTOSPACES) {
+			tabsize= (*charp < TXT_TABSIZE) ? *charp : TXT_TABSIZE;
+			
+			for (i=0; i<(*charp); i++)
 				if ((*linep)->line[i] != ' ') {
-					tabsize = 1;
+					tabsize= 0;
 					break;
 				}
+			
 			// if in the middle of the space-tab
-			if ((*charp) % tabsize != 0)
-					tabsize = ((*charp) % tabsize);
+			if (tabsize && (*charp) % TXT_TABSIZE != 0)
+				tabsize= ((*charp) % TXT_TABSIZE);
 		}
-	}
-
-	if (*charp== 0) {
-		if ((*linep)->prev) {
-			txt_move_up(text, sel);
-			*charp= (*linep)->len;
+		
+		if (tabsize)
+			(*charp)-= tabsize;
+		else {
+			const char *prev= BLI_str_prev_char_utf8((*linep)->line + *charp);
+			*charp= prev - (*linep)->line;
 		}
 	}
-	else (*charp)-= tabsize;
 
 	undoing= oundoing;
 	if(!undoing) txt_undo_add_op(text, sel?UNDO_SLEFT:UNDO_CLEFT);
@@ -835,8 +910,7 @@ void txt_move_left(Text *text, short sel)
 void txt_move_right(Text *text, short sel) 
 {
 	TextLine **linep;
-	int *charp, oundoing= undoing;
-	int tabsize=1, i=0;
+	int *charp, oundoing= undoing, do_tab= 0, i;
 	
 	if (!text) return;
 	if(sel) txt_curs_sel(text, &linep, &charp);
@@ -845,32 +919,33 @@ void txt_move_right(Text *text, short sel)
 
 	undoing= 1;
 
-	// do nice right only if there are only spaces
-	// spaces hardcoded in DNA_text_types.h
-	if (text->flags & TXT_TABSTOSPACES) {
-		tabsize = TXT_TABSIZE;
-
-		if ((*charp) + tabsize > (*linep)->len)
-			tabsize = 1;
-		else {
-			for (i=0;i<(*charp) + tabsize - ((*charp) % tabsize);i++)
-				if ((*linep)->line[i] != ' ') {
-					tabsize = 1;
-					break;
-				}
-			// if in the middle of the space-tab
-			tabsize -= (*charp) % tabsize;
-		}
-	}
-
 	if (*charp== (*linep)->len) {
 		if ((*linep)->next) {
 			txt_move_down(text, sel);
 			*charp= 0;
 		}
-	} else {
-		(*charp)+=tabsize;
+	} 
+	else {
+		// do nice right only if there are only spaces
+		// spaces hardcoded in DNA_text_types.h
+		if (text->flags & TXT_TABSTOSPACES && (*linep)->line[*charp]== ' ') {
+			do_tab= 1;
+			for (i=0; i<*charp; i++)
+				if ((*linep)->line[i]!= ' ') {
+					do_tab= 0;
+					break;
+				}
+		}
+		
+		if (do_tab) {
+			int tabsize= (*charp) % TXT_TABSIZE + 1;
+			for (i=*charp+1; (*linep)->line[i]==' ' && tabsize<TXT_TABSIZE; i++)
+				tabsize++;
+			(*charp)= i;
+		}
+		else (*charp)+= BLI_str_utf8_size((*linep)->line + *charp);
 	}
+	
 	undoing= oundoing;
 	if(!undoing) txt_undo_add_op(text, sel?UNDO_SRIGHT:UNDO_CRIGHT);
 
@@ -896,9 +971,12 @@ void txt_jump_left(Text *text, short sel)
 	count= 0;
 	for (i=0; i<3; i++) {
 		if (count < 2) {
-			while (*charp>0 && txt_char_type((*linep)->line[*charp-1])==i) {
-				txt_move_left(text, sel);
-				count++;
+			while (*charp>0) {
+				char *sym= BLI_str_prev_char_utf8((*linep)->line + *charp);
+				if (txt_char_type(BLI_str_utf8_as_unicode(sym))==i) {
+					txt_move_left(text, sel);
+					count++;
+				} else break;
 			}
 		}
 	}
@@ -927,9 +1005,12 @@ void txt_jump_right(Text *text, short sel)
 	count= 0;
 	for (i=0; i<3; i++) {
 		if (count < 2) {
-			while (*charp<(*linep)->len && txt_char_type((*linep)->line[*charp])==i) {
-				txt_move_right(text, sel);
-				count++;
+			while (*charp<(*linep)->len) {
+				char *sym= (*linep)->line + *charp;
+				if (txt_char_type(BLI_str_utf8_as_unicode(sym))==i) {
+					txt_move_right(text, sel);
+					count++;
+				} else break;
 			}
 		}
 	}
@@ -1014,6 +1095,7 @@ void txt_move_toline (Text *text, unsigned int line, short sel)
 	txt_move_to(text, line, 0, sel);
 }
 
+/* Moves to a certain byte in a line, not a certain utf8-character! */
 void txt_move_to (Text *text, unsigned int line, unsigned int ch, short sel)
 {
 	TextLine **linep, *oldl;
@@ -1396,42 +1478,45 @@ static void txt_shift_markers(Text *text, int lineno, int count)
 
 void txt_insert_buf(Text *text, const char *in_buffer)
 {
-	int i=0, l=0, j, u, len, lineno= -1, count= 0;
+	int l=0, u, len, lineno= -1, count= 0;
+	size_t i=0, j;
 	TextLine *add;
+	char *buffer;
 
 	if (!text) return;
 	if (!in_buffer) return;
 
 	txt_delete_sel(text);
 	
-	if(!undoing) txt_undo_add_block (text, UNDO_IBLOCK, in_buffer); 	
+	len= strlen(in_buffer);
+	buffer= BLI_strdupn(in_buffer, len);
+	len+= txt_extended_ascii_as_utf8(&buffer);
+	
+	if(!undoing) txt_undo_add_block(text, UNDO_IBLOCK, buffer);
 
 	u= undoing;
 	undoing= 1;
 
 	/* Read the first line (or as close as possible */
-	while (in_buffer[i] && in_buffer[i]!='\n') {
-		txt_add_raw_char(text, in_buffer[i]);
-		i++;
-	}
+	while (buffer[i] && buffer[i]!='\n')
+		txt_add_raw_char(text, BLI_str_utf8_as_unicode_step(buffer, &i));
 	
-	if (in_buffer[i]=='\n') txt_split_curline(text);
-	else { undoing = u; return; }
+	if (buffer[i]=='\n') txt_split_curline(text);
+	else { undoing = u; MEM_freeN(buffer); return; }
 	i++;
 
 	/* Read as many full lines as we can */
-	len= strlen(in_buffer);
 	lineno= txt_get_span(text->lines.first, text->curl);
 
 	while (i<len) {
 		l=0;
 
-		while (in_buffer[i] && in_buffer[i]!='\n') {
+		while (buffer[i] && buffer[i]!='\n') {
 			i++; l++;
 		}
 	
-		if(in_buffer[i]=='\n') {
-			add= txt_new_linen(in_buffer +(i-l), l);
+		if(buffer[i]=='\n') {
+			add= txt_new_linen(buffer +(i-l), l);
 			BLI_insertlinkbefore(&text->lines, text->curl, add);
 			i++;
 			count++;
@@ -1441,21 +1526,19 @@ void txt_insert_buf(Text *text, const char *in_buffer)
 				count= 0;
 			}
 
-			for (j= i-l; j<i && j<(int)strlen(in_buffer); j++) {
-				txt_add_raw_char(text, in_buffer[j]);
-			}
+			for (j= i-l; j<i && j<len; )
+				txt_add_raw_char(text, BLI_str_utf8_as_unicode_step(buffer, &j));
 			break;
 		}
 	}
+	
+	MEM_freeN(buffer);
 
 	if(count) {
 		txt_shift_markers(text, lineno, count);
-		count= 0;
 	}
 
 	undoing= u;
-
-	(void)count;
 }
 
 /******************/
@@ -1525,12 +1608,30 @@ void txt_print_undo(Text *text)
 			ops= "Selection ";
 		} else if (op==UNDO_CTO) {
 			ops= "Cursor ";
-		} else if (op==UNDO_INSERT) {
-			ops= "Insert";
-		} else if (op==UNDO_BS) {
-			ops= "Backspace";
-		} else if (op==UNDO_DEL) {
-			ops= "Delete";
+		} else if (op==UNDO_INSERT_1) {
+			ops= "Insert ascii ";
+		} else if (op==UNDO_INSERT_2) {
+			ops= "Insert 2 bytes ";
+		} else if (op==UNDO_INSERT_3) {
+			ops= "Insert 3 bytes ";
+		} else if (op==UNDO_INSERT_4) {
+			ops= "Insert unicode ";
+		} else if (op==UNDO_BS_1) {
+			ops= "Backspace for ascii ";
+		} else if (op==UNDO_BS_2) {
+			ops= "Backspace for 2 bytes ";
+		} else if (op==UNDO_BS_3) {
+			ops= "Backspace for 3 bytes ";
+		} else if (op==UNDO_BS_4) {
+			ops= "Backspace for unicode ";
+		} else if (op==UNDO_DEL_1) {
+			ops= "Delete ascii ";
+		} else if (op==UNDO_DEL_2) {
+			ops= "Delete 2 bytes ";
+		} else if (op==UNDO_DEL_3) {
+			ops= "Delete 3 bytes ";
+		} else if (op==UNDO_DEL_4) {
+			ops= "Delete unicode ";
 		} else if (op==UNDO_SWAP) {
 			ops= "Cursor swap";
 		} else if (op==UNDO_DBLOCK) {
@@ -1550,10 +1651,35 @@ void txt_print_undo(Text *text)
 		}
 		
 		printf ("Op (%o) at %d = %s", op, i, ops);
-		if (op==UNDO_INSERT || op==UNDO_BS || op==UNDO_DEL) {
-			i++;
-			printf (" - Char is %c", text->undo_buf[i]);  
+		if (op >= UNDO_INSERT_1 && op <= UNDO_DEL_4) {
 			i++;
+			printf (" - Char is ");
+			switch (op) {
+				case UNDO_INSERT_1: case UNDO_BS_1: case UNDO_DEL_1:
+					printf ("%c", text->undo_buf[i]);  
+					i++;
+					break;
+				case UNDO_INSERT_2: case UNDO_BS_2: case UNDO_DEL_2:
+					printf ("%c%c", text->undo_buf[i], text->undo_buf[i+1]);  
+					i+=2;
+					break;
+				case UNDO_INSERT_3: case UNDO_BS_3: case UNDO_DEL_3:
+					printf ("%c%c%c", text->undo_buf[i], text->undo_buf[i+1], text->undo_buf[i+2]);  
+					i+=3;
+					break;
+				case UNDO_INSERT_4: case UNDO_BS_4: case UNDO_DEL_4: {
+					unsigned int uc;
+					char c[BLI_UTF8_MAX+1];
+					size_t c_len;
+					uc= text->undo_buf[i]; i++;
+					uc= uc+(text->undo_buf[i]<<8); i++;
+					uc= uc+(text->undo_buf[i]<<16); i++;
+					uc= uc+(text->undo_buf[i]<<24); i++;
+					c_len= BLI_str_utf8_from_unicode(uc, c);
+					c[c_len]= '\0';
+					printf ("%s", c);
+				}
+			}
 		} else if (op==UNDO_STO || op==UNDO_CTO) {
 			i++;
 
@@ -1635,40 +1761,43 @@ static void txt_undo_add_op(Text *text, int op)
 	text->undo_buf[text->undo_pos+1]= 0;
 }
 
+static void txt_undo_store_uint16(char *undo_buf, int *undo_pos, unsigned short value) 
+{
+	undo_buf[*undo_pos]= (value)&0xff;
+	(*undo_pos)++;
+	undo_buf[*undo_pos]= (value>>8)&0xff;
+	(*undo_pos)++;
+}
+
+static void txt_undo_store_uint32(char *undo_buf, int *undo_pos, unsigned int value) 
+{
+	undo_buf[*undo_pos]= (value)&0xff;
+	(*undo_pos)++;
+	undo_buf[*undo_pos]= (value>>8)&0xff;
+	(*undo_pos)++;
+	undo_buf[*undo_pos]= (value>>16)&0xff;
+	(*undo_pos)++;
+	undo_buf[*undo_pos]= (value>>24)&0xff;
+	(*undo_pos)++;
+}
+
 static void txt_undo_add_block(Text *text, int op, const char *buf)
 {
-	int length;
-	
-	length= strlen(buf);
+	unsigned int length= strlen(buf);
 	
 	if(!max_undo_test(text, length+11))
 		return;
 
 	text->undo_pos++;
 	text->undo_buf[text->undo_pos]= op;
-	
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (length)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (length>>8)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (length>>16)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (length>>24)&0xff;
-
 	text->undo_pos++;
+	
+	txt_undo_store_uint32(text->undo_buf, &text->undo_pos, length);
+	
 	strncpy(text->undo_buf+text->undo_pos, buf, length);
 	text->undo_pos+=length;
 
-	text->undo_buf[text->undo_pos]= (length)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (length>>8)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (length>>16)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (length>>24)&0xff;
-
-	text->undo_pos++;
+	txt_undo_store_uint32(text->undo_buf, &text->undo_pos, length);
 	text->undo_buf[text->undo_pos]= op;
 	
 	text->undo_buf[text->undo_pos+1]= 0;
@@ -1685,51 +1814,139 @@ void txt_undo_add_toop(Text *text, int op, unsigned int froml, unsigned short fr
 	text->undo_buf[text->undo_pos]= op;
 
 	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (fromc)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (fromc>>8)&0xff;
+	
+	txt_undo_store_uint16(text->undo_buf, &text->undo_pos, fromc);
+	txt_undo_store_uint32(text->undo_buf, &text->undo_pos, froml);
+	txt_undo_store_uint16(text->undo_buf, &text->undo_pos, toc);
+	txt_undo_store_uint32(text->undo_buf, &text->undo_pos, tol);
+		
+	text->undo_buf[text->undo_pos]= op;
 
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (froml)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (froml>>8)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (froml>>16)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (froml>>24)&0xff;
+	text->undo_buf[text->undo_pos+1]= 0;
+}
 
+static void txt_undo_add_charop(Text *text, int op_start, unsigned int c)
+{
+	char utf8[BLI_UTF8_MAX];
+	size_t i, utf8_size = BLI_str_utf8_from_unicode(c, utf8);
+	
+	if(!max_undo_test(text, 3 + utf8_size))
+		return;
+	
 	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (toc)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (toc>>8)&0xff;
+	
+	if (utf8_size < 4) {
+		text->undo_buf[text->undo_pos]= op_start + utf8_size - 1;
+		text->undo_pos++;
+		
+		for (i = 0; i < utf8_size; i++) {
+			text->undo_buf[text->undo_pos]= utf8[i];
+			text->undo_pos++;
+		}
+		
+		text->undo_buf[text->undo_pos]= op_start + utf8_size - 1;
+	} else {
+		text->undo_buf[text->undo_pos]= op_start + 3;
+		text->undo_pos++;
+		txt_undo_store_uint32(text->undo_buf, &text->undo_pos, c);
+		text->undo_buf[text->undo_pos]= op_start + 3;
+	}
+	
+	text->undo_buf[text->undo_pos+1]= 0;
+}
 
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (tol)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (tol>>8)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (tol>>16)&0xff;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= (tol>>24)&0xff;
+static unsigned short txt_undo_read_uint16(const char *undo_buf, int *undo_pos)
+{
+	unsigned short val;
+	val= undo_buf[*undo_pos]; (*undo_pos)--;
+	val= (val<<8)+undo_buf[*undo_pos]; (*undo_pos)--;
+	return val;
+}
 
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= op;
+static unsigned int txt_undo_read_uint32(const char *undo_buf, int *undo_pos)
+{
+	unsigned int val;
+	val= undo_buf[*undo_pos]; (*undo_pos)--;
+	val= (val<<8)+undo_buf[*undo_pos]; (*undo_pos)--;
+	val= (val<<8)+undo_buf[*undo_pos]; (*undo_pos)--;
+	val= (val<<8)+undo_buf[*undo_pos]; (*undo_pos)--;
+	return val;
+}
 
-	text->undo_buf[text->undo_pos+1]= 0;
+static unsigned int txt_undo_read_unicode(const char *undo_buf, int *undo_pos, short bytes)
+{
+	unsigned int unicode;
+	char utf8[BLI_UTF8_MAX+1];
+	
+	switch (bytes) {
+		case 1: /* ascii */
+			unicode = undo_buf[*undo_pos]; (*undo_pos)--; 
+			break;
+		case 2: /* 2-byte symbol */
+			utf8[2] = '\0';
+			utf8[1] = undo_buf[*undo_pos]; (*undo_pos)--;
+			utf8[0] = undo_buf[*undo_pos]; (*undo_pos)--;
+			unicode= BLI_str_utf8_as_unicode(utf8);
+			break;
+		case 3: /* 3-byte symbol */
+			utf8[3] = '\0';
+			utf8[2] = undo_buf[*undo_pos]; (*undo_pos)--;
+			utf8[1] = undo_buf[*undo_pos]; (*undo_pos)--;
+			utf8[0] = undo_buf[*undo_pos]; (*undo_pos)--;
+			unicode= BLI_str_utf8_as_unicode(utf8);
+			break;
+		case 4: /* 32-bit unicode symbol */
+			unicode= txt_undo_read_uint32(undo_buf, undo_pos);
+	}
+	
+	return unicode;
 }
 
-static void txt_undo_add_charop(Text *text, int op, char c)
+static unsigned short txt_redo_read_uint16(const char *undo_buf, int *undo_pos)
 {
-	if(!max_undo_test(text, 4))
-		return;
+	unsigned short val;
+	val = undo_buf[*undo_pos]; (*undo_pos)++;
+	val = val+(undo_buf[*undo_pos]<<8); (*undo_pos)++;
+	return val;
+}
 
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= op;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= c;
-	text->undo_pos++;
-	text->undo_buf[text->undo_pos]= op;
-	text->undo_buf[text->undo_pos+1]= 0;
+static unsigned int txt_redo_read_uint32(const char *undo_buf, int *undo_pos)
+{
+	unsigned int val;
+	val= undo_buf[*undo_pos]; (*undo_pos)++;
+	val= val+(undo_buf[*undo_pos]<<8); (*undo_pos)++;
+	val= val+(undo_buf[*undo_pos]<<16); (*undo_pos)++;
+	val= val+(undo_buf[*undo_pos]<<24); (*undo_pos)++;
+	return val;
+}
+
+static unsigned int txt_redo_read_unicode(const char *undo_buf, int *undo_pos, short bytes)
+{
+	unsigned int unicode;
+	char utf8[BLI_UTF8_MAX+1];
+	
+	switch (bytes) {
+		case 1: /* ascii */
+			unicode = undo_buf[*undo_pos]; (*undo_pos)++; 
+			break;
+		case 2: /* 2-byte symbol */
+			utf8[0] = undo_buf[*undo_pos]; (*undo_pos)++;
+			utf8[1] = undo_buf[*undo_pos]; (*undo_pos)++;
+			utf8[2] = '\0';
+			unicode= BLI_str_utf8_as_unicode(utf8);
+			break;
+		case 3: /* 3-byte symbol */
+			utf8[0] = undo_buf[*undo_pos]; (*undo_pos)++;
+			utf8[1] = undo_buf[*undo_pos]; (*undo_pos)++;
+			utf8[2] = undo_buf[*undo_pos]; (*undo_pos)++;
+			utf8[3] = '\0';
+			unicode= BLI_str_utf8_as_unicode(utf8);
+			break;
+		case 4: /* 32-bit unicode symbol */
+			unicode= txt_undo_read_uint32(undo_buf, undo_pos);
+	}
+	
+	return unicode;
 }
 
 void txt_do_undo(Text *text)
@@ -1792,13 +2009,8 @@ void txt_do_undo(Text *text)
 			text->undo_pos--;
 			text->undo_pos--;
 		
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-
-			charp= text->undo_buf[text->undo_pos]; text->undo_pos--;
-			charp= (charp<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
+			linep= txt_undo_read_uint32(text->undo_buf, &text->undo_pos);
+			charp= txt_undo_read_uint16(text->undo_buf, &text->undo_pos);
 			
 			if (op==UNDO_CTO) {
 				txt_move_toline(text, linep, 0);
@@ -1812,23 +2024,23 @@ void txt_do_undo(Text *text)
 			text->undo_pos--;
 			break;
 			
-		case UNDO_INSERT:
+		case UNDO_INSERT_1: case UNDO_INSERT_2: case UNDO_INSERT_3: case UNDO_INSERT_4:
 			txt_backspace_char(text);
-			text->undo_pos--;
+			text->undo_pos-= op - UNDO_INSERT_1 + 1;
 			text->undo_pos--;
 			break;
 
-		case UNDO_BS:
-			txt_add_char(text, text->undo_buf[text->undo_pos]);
-			text->undo_pos--;
+		case UNDO_BS_1: case UNDO_BS_2: case UNDO_BS_3: case UNDO_BS_4:
+			charp = op - UNDO_BS_1 + 1;
+			txt_add_char(text, txt_undo_read_unicode(text->undo_buf, &text->undo_pos, charp));
 			text->undo_pos--;
-			break;
-
-		case UNDO_DEL:
-			txt_add_char(text, text->undo_buf[text->undo_pos]);
+			break;		
+			
+		case UNDO_DEL_1: case UNDO_DEL_2: case UNDO_DEL_3: case UNDO_DEL_4: 
+			charp = op - UNDO_DEL_1 + 1;
+			txt_add_char(text, txt_undo_read_unicode(text->undo_buf, &text->undo_pos, charp));
 			txt_move_left(text, 0);
 			text->undo_pos--;
-			text->undo_pos--;
 			break;
 
 		case UNDO_SWAP:
@@ -1836,10 +2048,7 @@ void txt_do_undo(Text *text)
 			break;
 
 		case UNDO_DBLOCK:
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
+			linep= txt_undo_read_uint32(text->undo_buf, &text->undo_pos);
 
 			buf= MEM_mallocN(linep+1, "dblock buffer");
 			for (i=0; i < linep; i++){
@@ -1863,25 +2072,31 @@ void txt_do_undo(Text *text)
 			}
 			text->curc= holdc;
 
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
+			text->undo_pos--;
+			text->undo_pos--;
+			text->undo_pos--; 
+			text->undo_pos--;
 
 			text->undo_pos--;
 			
 			break;
 
 		case UNDO_IBLOCK:
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep= (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-
+			linep= txt_undo_read_uint32(text->undo_buf, &text->undo_pos);
 			txt_delete_sel(text);
+
+			/* txt_backspace_char removes utf8-characters, not bytes */
+			buf= MEM_mallocN(linep+1, "iblock buffer");
+			for (i=0; i < linep; i++){
+				buf[(linep-1)-i]= text->undo_buf[text->undo_pos]; 
+				text->undo_pos--;
+			}
+			buf[i]= 0;
+			linep= txt_utf8_len(buf);
+			MEM_freeN(buf);
+
 			while (linep>0) {
 				txt_backspace_char(text);
-				text->undo_pos--;
 				linep--;
 			}
 
@@ -1897,30 +2112,23 @@ void txt_do_undo(Text *text)
 		case UNDO_UNINDENT:
 		case UNDO_COMMENT:
 		case UNDO_UNCOMMENT:
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep = (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep = (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep = (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
+			linep= txt_undo_read_uint32(text->undo_buf, &text->undo_pos);
 			//linep is now the end line of the selection
 			
-			charp = text->undo_buf[text->undo_pos]; text->undo_pos--;
-			charp = (charp<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
+			charp = txt_undo_read_uint16(text->undo_buf, &text->undo_pos);
 			//charp is the last char selected or text->line->len
-			//set the selcetion for this now
+			
+			//set the selection for this now
 			text->selc = charp;
 			text->sell = text->lines.first;
 			for (i= 0; i < linep; i++) {
 				text->sell = text->sell->next;
 			}
 
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep = (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep = (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
-			linep = (linep<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
+			linep= txt_undo_read_uint32(text->undo_buf, &text->undo_pos);
 			//first line to be selected
 			
-			charp = text->undo_buf[text->undo_pos]; text->undo_pos--;
-			charp = (charp<<8)+text->undo_buf[text->undo_pos]; text->undo_pos--;
+			charp = txt_undo_read_uint16(text->undo_buf, &text->undo_pos);
 			//first postion to be selected
 			text->curc = charp;
 			text->curl = text->lines.first;
@@ -2014,22 +2222,22 @@ void txt_do_redo(Text *text)
 			txt_move_down(text, 1);
 			break;
 		
-		case UNDO_INSERT:
-			text->undo_pos++;
-			txt_add_char(text, text->undo_buf[text->undo_pos]);
+		case UNDO_INSERT_1: case UNDO_INSERT_2: case UNDO_INSERT_3: case UNDO_INSERT_4:
 			text->undo_pos++;
+			charp = op - UNDO_INSERT_1 + 1;
+			txt_add_char(text, txt_redo_read_unicode(text->undo_buf, &text->undo_pos, charp));
 			break;
 
-		case UNDO_BS:
+		case UNDO_BS_1: case UNDO_BS_2: case UNDO_BS_3: case UNDO_BS_4:
 			text->undo_pos++;
 			txt_backspace_char(text);
-			text->undo_pos++;
+			text->undo_pos+= op - UNDO_BS_1 + 1;
 			break;
 
-		case UNDO_DEL:
+		case UNDO_DEL_1: case UNDO_DEL_2: case UNDO_DEL_3: case UNDO_DEL_4:
 			text->undo_pos++;
 			txt_delete_char(text);
-			text->undo_pos++;
+			text->undo_pos+= op - UNDO_DEL_1 + 1;
 			break;
 
 		case UNDO_SWAP:
@@ -2049,15 +2257,8 @@ void txt_do_redo(Text *text)
 
 			text->undo_pos++;
 
-			charp= text->undo_buf[text->undo_pos];
-			text->undo_pos++;
-			charp= charp+(text->undo_buf[text->undo_pos]<<8);
-
-			text->undo_pos++;
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<16); text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<24); text->undo_pos++;
+			charp= txt_redo_read_uint16(text->undo_buf, &text->undo_pos);
+			linep= txt_redo_read_uint32(text->undo_buf, &text->undo_pos);
 			
 			if (op==UNDO_CTO) {
 				txt_move_toline(text, linep, 0);
@@ -2072,12 +2273,9 @@ void txt_do_redo(Text *text)
 
 		case UNDO_DBLOCK:
 			text->undo_pos++;
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<16); text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<24); text->undo_pos++;
-
+			linep= txt_redo_read_uint32(text->undo_buf, &text->undo_pos);
 			txt_delete_sel(text);
+			
 			text->undo_pos+=linep;
 
 			text->undo_pos++;
@@ -2089,10 +2287,7 @@ void txt_do_redo(Text *text)
 
 		case UNDO_IBLOCK:
 			text->undo_pos++;
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<16); text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<24); text->undo_pos++;
+			linep= txt_redo_read_uint32(text->undo_buf, &text->undo_pos);
 
 			buf= MEM_mallocN(linep+1, "iblock buffer");
 			memcpy (buf, &text->undo_buf[text->undo_pos], linep);
@@ -2102,26 +2297,21 @@ void txt_do_redo(Text *text)
 			txt_insert_buf(text, buf);			
 			MEM_freeN(buf);
 
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<16); text->undo_pos++;
-			linep= linep+(text->undo_buf[text->undo_pos]<<24); text->undo_pos++;
-			(void)linep;
-
+			text->undo_pos++;
+			text->undo_pos++;
+			text->undo_pos++; 
+			text->undo_pos++;
 			break;
+			
 		case UNDO_INDENT:
 		case UNDO_UNINDENT:
 		case UNDO_COMMENT:
 		case UNDO_UNCOMMENT:
 			text->undo_pos++;
-			charp = text->undo_buf[text->undo_pos]; text->undo_pos++;
-			charp = charp+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++;
+			charp = txt_redo_read_uint16(text->undo_buf, &text->undo_pos);
 			//charp is the first char selected or 0
 			
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos++;
-			linep = linep+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++;
-			linep = linep+(text->undo_buf[text->undo_pos]<<16); text->undo_pos++;
-			linep = linep+(text->undo_buf[text->undo_pos]<<24); text->undo_pos++;
+			linep= txt_redo_read_uint32(text->undo_buf, &text->undo_pos);
 			//linep is now the first line of the selection			
 			//set the selcetion for this now
 			text->curc = charp;
@@ -2130,13 +2320,10 @@ void txt_do_redo(Text *text)
 				text->curl = text->curl->next;
 			}
 			
-			charp = text->undo_buf[text->undo_pos]; text->undo_pos++;
-			charp = charp+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++;
+			charp = txt_redo_read_uint16(text->undo_buf, &text->undo_pos);
 			//last postion to be selected
-			linep= text->undo_buf[text->undo_pos]; text->undo_pos++;
-			linep = linep+(text->undo_buf[text->undo_pos]<<8); text->undo_pos++;
-			linep = linep+(text->undo_buf[text->undo_pos]<<16); text->undo_pos++;
-			linep = linep+(text->undo_buf[text->undo_pos]<<24); text->undo_pos++;
+			
+			linep= txt_redo_read_uint32(text->undo_buf, &text->undo_pos);
 			//Last line to be selected
 			
 			text->selc = charp;
@@ -2203,8 +2390,7 @@ void txt_split_curline (Text *text)
 	left[text->curc]=0;
 	
 	right= MEM_mallocN(text->curl->len - text->curc+1, "textline_string");
-	if (text->curl->len - text->curc) memcpy(right, text->curl->line+text->curc, text->curl->len-text->curc);
-	right[text->curl->len - text->curc]=0;
+	memcpy(right, text->curl->line+text->curc, text->curl->len-text->curc+1);
 
 	MEM_freeN(text->curl->line);
 	if (text->curl->format) MEM_freeN(text->curl->format);
@@ -2228,7 +2414,7 @@ void txt_split_curline (Text *text)
 	txt_clean_text(text);
 	
 	txt_pop_sel(text);
-	if(!undoing) txt_undo_add_charop(text, UNDO_INSERT, '\n');
+	if(!undoing) txt_undo_add_charop(text, UNDO_INSERT_1, '\n');
 }
 
 static void txt_delete_line (Text *text, TextLine *line) 
@@ -2296,9 +2482,9 @@ static void txt_combine_lines (Text *text, TextLine *linea, TextLine *lineb)
 	txt_clean_text(text);
 }
 
-void txt_delete_char (Text *text) 
+void txt_delete_char(Text *text) 
 {
-	char c='\n';
+	unsigned int c='\n';
 	
 	if (!text) return;
 	if (!text->curl) return;
@@ -2314,12 +2500,14 @@ void txt_delete_char (Text *text)
 			txt_pop_sel(text);
 		}
 	} else { /* Just deleting a char */
-		int i= text->curc;
+		size_t c_len = 0;
+		TextMarker *mrk;
+		c= BLI_str_utf8_as_unicode_and_size(text->curl->line + text->curc, &c_len);
 
-		TextMarker *mrk= txt_find_marker_region(text, text->curl, i-1, text->curl->len, 0, 0);
+		mrk= txt_find_marker_region(text, text->curl, text->curc - c_len, text->curl->len, 0, 0);
 		if (mrk) {
 			int lineno= mrk->lineno;
-			if (mrk->end==i) {
+			if (mrk->end==text->curc) {
 				if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
 					txt_clear_markers(text, mrk->group, TMARK_TEMP);
 				} else {
@@ -2328,18 +2516,15 @@ void txt_delete_char (Text *text)
 				return;
 			}
 			do {
-				if (mrk->start>i) mrk->start--;
-				mrk->end--;
+				if (mrk->start>text->curc) mrk->start-= c_len;
+				mrk->end-= c_len;
 				mrk= mrk->next;
 			} while (mrk && mrk->lineno==lineno);
 		}
 		
-		c= text->curl->line[i];
-		while(i< text->curl->len) {
-			text->curl->line[i]= text->curl->line[i+1];
-			i++;
-		}
-		text->curl->len--;
+		memmove(text->curl->line+text->curc, text->curl->line+text->curc+c_len, text->curl->len-text->curc-c_len+1);
+
+		text->curl->len-= c_len;
 
 		txt_pop_sel(text);
 	}
@@ -2347,7 +2532,7 @@ void txt_delete_char (Text *text)
 	txt_make_dirty(text);
 	txt_clean_text(text);
 	
-	if(!undoing) txt_undo_add_charop(text, UNDO_DEL, c);
+	if(!undoing) txt_undo_add_charop(text, UNDO_DEL_1, c);
 }
 
 void txt_delete_word (Text *text) 
@@ -2358,7 +2543,7 @@ void txt_delete_word (Text *text)
 
 void txt_backspace_char (Text *text) 
 {
-	char c='\n';
+	unsigned int c='\n';
 	
 	if (!text) return;
 	if (!text->curl) return;
@@ -2378,12 +2563,15 @@ void txt_backspace_char (Text *text)
 		txt_pop_sel(text);
 	}
 	else { /* Just backspacing a char */
-		int i= text->curc-1;
+		size_t c_len = 0;
+		TextMarker *mrk;
+		char *prev = BLI_str_prev_char_utf8(text->curl->line + text->curc);
+		c= BLI_str_utf8_as_unicode_and_size(prev, &c_len);
 
-		TextMarker *mrk= txt_find_marker_region(text, text->curl, i, text->curl->len, 0, 0);
+		mrk= txt_find_marker_region(text, text->curl, text->curc - c_len, text->curl->len, 0, 0);
 		if (mrk) {
 			int lineno= mrk->lineno;
-			if (mrk->start==i+1) {
+			if (mrk->start==text->curc) {
 				if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
 					txt_clear_markers(text, mrk->group, TMARK_TEMP);
 				} else {
@@ -2392,19 +2580,16 @@ void txt_backspace_char (Text *text)
 				return;
 			}
 			do {
-				if (mrk->start>i) mrk->start--;
-				mrk->end--;
+				if (mrk->start>text->curc - c_len) mrk->start-= c_len;
+				mrk->end-= c_len;
 				mrk= mrk->next;
 			} while (mrk && mrk->lineno==lineno);
 		}
 		
-		c= text->curl->line[i];
-		while(i< text->curl->len) {
-			text->curl->line[i]= text->curl->line[i+1];
-			i++;
-		}
-		text->curl->len--;
-		text->curc--;
+		memcpy(text->curl->line + text->curc - c_len, text->curl->line + text->curc, text->curl->len-text->curc+1);
+
+		text->curl->len-= c_len;
+		text->curc-= c_len;
 
 		txt_pop_sel(text);
 	}
@@ -2412,7 +2597,7 @@ void txt_backspace_char (Text *text)
 	txt_make_dirty(text);
 	txt_clean_text(text);
 	
-	if(!undoing) txt_undo_add_charop(text, UNDO_BS, c);
+	if(!undoing) txt_undo_add_charop(text, UNDO_BS_1, c);
 }
 
 void txt_backspace_word (Text *text) 
@@ -2436,11 +2621,12 @@ static void txt_convert_tab_to_spaces (Text *text)
 	txt_insert_buf(text, sb);
 }
 
-static int txt_add_char_intern (Text *text, char add, int replace_tabs)
+static int txt_add_char_intern (Text *text, unsigned int add, int replace_tabs)
 {
-	int len, lineno;
-	char *tmp;
+	int lineno;
+	char *tmp, ch[BLI_UTF8_MAX];
 	TextMarker *mrk;
+	size_t add_len;
 	
 	if (!text) return 0;
 	if (!text->curl) return 0;
@@ -2458,43 +2644,42 @@ static int txt_add_char_intern (Text *text, char add, int replace_tabs)
 
 	txt_delete_sel(text);
 	
+	add_len = BLI_str_utf8_from_unicode(add, ch);
 	mrk= txt_find_marker_region(text, text->curl, text->curc-1, text->curl->len, 0, 0);
 	if (mrk) {
 		lineno= mrk->lineno;
 		do {
-			if (mrk->start>text->curc) mrk->start++;
-			mrk->end++;
+			if (mrk->start>text->curc) mrk->start+= add_len;
+			mrk->end+= add_len;
 			mrk= mrk->next;
 		} while (mrk && mrk->lineno==lineno);
 	}
 	
-	tmp= MEM_mallocN(text->curl->len+2, "textline_string");
-	
-	if(text->curc) memcpy(tmp, text->curl->line, text->curc);
-	tmp[text->curc]= add;
+	tmp= MEM_mallocN(text->curl->len+add_len+1, "textline_string");
 	
-	len= text->curl->len - text->curc;
-	if(len>0) memcpy(tmp+text->curc+1, text->curl->line+text->curc, len);
-	tmp[text->curl->len+1]=0;
+	memcpy(tmp, text->curl->line, text->curc);
+	memcpy(tmp+text->curc, ch, add_len);
+	memcpy(tmp+text->curc+add_len, text->curl->line+text->curc, text->curl->len-text->curc+1);
+
 	make_new_line(text->curl, tmp);
 		
-	text->curc++;
+	text->curc+= add_len;
 
 	txt_pop_sel(text);
 	
 	txt_make_dirty(text);
 	txt_clean_text(text);
 
-	if(!undoing) txt_undo_add_charop(text, UNDO_INSERT, add);
+	if(!undoing) txt_undo_add_charop(text, UNDO_INSERT_1, add);
 	return 1;
 }
 
-int txt_add_char (Text *text, char add)
+int txt_add_char (Text *text, unsigned int add)
 {
 	return txt_add_char_intern(text, add, text->flags & TXT_TABSTOSPACES);
 }
 
-int txt_add_raw_char (Text *text, char add)
+int txt_add_raw_char (Text *text, unsigned int add)
 {
 	return txt_add_char_intern(text, add, 0);
 }
@@ -2505,34 +2690,48 @@ void txt_delete_selected(Text *text)
 	txt_make_dirty(text);
 }
 
-int txt_replace_char (Text *text, char add)
+int txt_replace_char (Text *text, unsigned int add)
 {
-	char del;
+	unsigned int del;
+	size_t del_size = 0, add_size;
+	char ch[BLI_UTF8_MAX];
 	
 	if (!text) return 0;
 	if (!text->curl) return 0;
 
 	/* If text is selected or we're at the end of the line just use txt_add_char */
 	if (text->curc==text->curl->len || txt_has_sel(text) || add=='\n') {
-		TextMarker *mrk;
 		int i= txt_add_char(text, add);
-		mrk= txt_find_marker(text, text->curl, text->curc, 0, 0);
-		if (mrk && mrk->end==text->curc) mrk->end--;
+		TextMarker *mrk= txt_find_marker(text, text->curl, text->curc, 0, 0);
+		if (mrk) BLI_freelinkN(&text->markers, mrk);
 		return i;
 	}
 	
-	del= text->curl->line[text->curc];
-	text->curl->line[text->curc]= (unsigned char) add;
-	text->curc++;
-	txt_pop_sel(text);
+	del= BLI_str_utf8_as_unicode_and_size(text->curl->line + text->curc, &del_size);
+	add_size= BLI_str_utf8_from_unicode(add, ch);
 	
+	if (add_size > del_size) {
+		char *tmp= MEM_mallocN(text->curl->len+add_size-del_size+1, "textline_string");
+		memcpy(tmp, text->curl->line, text->curc);
+		memcpy(tmp+text->curc+add_size, text->curl->line+text->curc+del_size, text->curl->len-text->curc-del_size+1);
+		MEM_freeN(text->curl->line);
+		text->curl->line = tmp;
+	} else if (add_size < del_size) {
+		char *tmp= text->curl->line;
+		memmove(tmp+text->curc+add_size, tmp+text->curc+del_size, text->curl->len-text->curc-del_size+1);
+	}
+	
+	memcpy(text->curl->line + text->curc, ch, add_size);
+	text->curc+= add_size;
+	
+	txt_pop_sel(text);
 	txt_make_dirty(text);
 	txt_clean_text(text);
 
 	/* Should probably create a new op for this */
 	if(!undoing) {
-		txt_undo_add_charop(text, UNDO_DEL, del);
-		txt_undo_add_charop(text, UNDO_INSERT, add);
+		txt_undo_add_charop(text, UNDO_DEL_1, del);
+		txt_undo_add_charop(text, UNDO_INSERT_1, add);
 	}
 	return 1;
 }