2.50:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.

27 files changed, 412 insertions, 188 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 25ca0b0f1b1..bc6e549dc6f 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -904,7 +904,7 @@ static void emDM_drawMappedFacesGLSL(DerivedMesh *dm,
 	glShadeModel(GL_SMOOTH);
 
 	for (i=0,eve=em->verts.first; eve; eve= eve->next)
-		eve->tmp.l = (long) i++;
+		eve->tmp.l = (intptr_t) i++;
 
 #define PASSATTRIB(efa, eve, vert) {											\
 	if(attribs.totorco) {														\
@@ -1581,6 +1581,11 @@ static void add_weight_mcol_dm(Object *ob, DerivedMesh *dm)
 	CustomData_add_layer(&dm->faceData, CD_WEIGHT_MCOL, CD_ASSIGN, wtcol, dm->numFaceData);
 }
 
+/* new value for useDeform -1  (hack for the gameengine):
+ * - apply only the modifier stack of the object, skipping the virtual modifiers,
+ * - don't apply the key
+ * - apply deform modifiers and input vertexco
+ */
 static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos)[3],
                                 DerivedMesh **deform_r, DerivedMesh **final_r,
                                 int useRenderParams, int useDeform,
@@ -1595,7 +1600,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 	int numVerts = me->totvert;
 	int required_mode;
 
-	md = firstmd = modifiers_getVirtualModifierList(ob);
+	md = firstmd = (useDeform<0) ? ob->modifiers.first : modifiers_getVirtualModifierList(ob);
 
 	modifiers_clearErrors(ob);
 
@@ -1612,8 +1617,10 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 	else required_mode = eModifierMode_Realtime;
 
 	if(useDeform) {
-		if(do_ob_key(scene, ob)) /* shape key makes deform verts */
+		if(useDeform > 0 && do_ob_key(scene, ob)) /* shape key makes deform verts */
 			deformedVerts = mesh_getVertexCos(me, &numVerts);
+		else if(inputVertexCos)
+			deformedVerts = inputVertexCos;
 		
 		/* Apply all leading deforming modifiers */
 		for(;md; md = md->next, curr = curr->next) {
@@ -1623,6 +1630,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 			
 			if((md->mode & required_mode) != required_mode) continue;
 			if(mti->isDisabled && mti->isDisabled(md)) continue;
+			if(useDeform < 0 && mti->dependsOnTime && mti->dependsOnTime(md)) continue;
 
 			if(mti->type == eModifierTypeType_OnlyDeform) {
 				if(!deformedVerts)
@@ -1678,6 +1686,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 		}
 		if(mti->isDisabled && mti->isDisabled(md)) continue;
 		if(needMapping && !modifier_supportsMapping(md)) continue;
+		if(useDeform < 0 && mti->dependsOnTime && mti->dependsOnTime(md)) continue;
 
 		/* add an orco layer if needed by this modifier */
 		if(dm && mti->requiredDataMask) {
@@ -2199,6 +2208,16 @@ DerivedMesh *mesh_create_derived_no_deform(Scene *scene, Object *ob, float (*ver
 	return final;
 }
 
+DerivedMesh *mesh_create_derived_no_virtual(Scene *scene, Object *ob, float (*vertCos)[3],
+                                            CustomDataMask dataMask)
+{
+	DerivedMesh *final;
+	
+	mesh_calc_modifiers(scene, ob, vertCos, NULL, &final, 0, -1, 0, dataMask, -1);
+
+	return final;
+}
+
 DerivedMesh *mesh_create_derived_no_deform_render(Scene *scene, Object *ob,
                                                   float (*vertCos)[3],
                                                   CustomDataMask dataMask)
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile
index 1528ec1c86e..a6a5066b574 100644
--- a/source/blender/blenkernel/intern/Makefile
+++ b/source/blender/blenkernel/intern/Makefile
@@ -82,7 +82,7 @@ CPPFLAGS += -I../../gpu
 CPPFLAGS += -I..
 
 # path to bullet2, for cloth
-CPPFLAGS += -I../../../../extern/bullet2/src
+CPPFLAGS += -I$(NAN_BULLET2)/include
 CPPFLAGS += -I$(NAN_FREETYPE)/include
 CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
 
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 3169905b7f5..5fc7d18689d 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -400,7 +400,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, char *filename)
 	MEM_freeN(bfd);
 }
 
-static void handle_subversion_warning(Main *main)
+static int handle_subversion_warning(Main *main)
 {
 	if(main->minversionfile > BLENDER_VERSION ||
 	   (main->minversionfile == BLENDER_VERSION && 
@@ -411,7 +411,7 @@ static void handle_subversion_warning(Main *main)
 		sprintf(str, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile);
 // XXX		error(str);
 	}
-		
+	return 1;
 }
 
 void BKE_userdef_free(void)
@@ -438,9 +438,14 @@ int BKE_read_file(bContext *C, char *dir, void *unused, ReportList *reports)
 	if (bfd) {
 		if(bfd->user) retval= 2;
 		
-		setup_app_data(C, bfd, dir);
-		
-		handle_subversion_warning(G.main);
+		if(0==handle_subversion_warning(bfd->main)) {
+			free_main(bfd->main);
+			MEM_freeN(bfd);
+			bfd= NULL;
+			retval= 0;
+		}
+		else
+			setup_app_data(C, bfd, dir); // frees BFD
 	} 
 	else
 		BKE_reports_prependf(reports, "Loading %s failed: ", dir);
diff --git a/source/blender/blenkernel/intern/bmfont.c b/source/blender/blenkernel/intern/bmfont.c
index 0af54b86ed6..09770b2b4ba 100644
--- a/source/blender/blenkernel/intern/bmfont.c
+++ b/source/blender/blenkernel/intern/bmfont.c
@@ -178,7 +178,7 @@ void detectBitmapFont(ImBuf *ibuf)
 {
 	unsigned char * rect;
 	unsigned short version;
-	long i;
+	int i;
 	
 	if (ibuf != NULL) {
 	        // bitmap must have an x size that is a power of two
diff --git a/source/blender/blenkernel/intern/bullet.c b/source/blender/blenkernel/intern/bullet.c
index b389f8c0536..44e8ed1f08c 100644
--- a/source/blender/blenkernel/intern/bullet.c
+++ b/source/blender/blenkernel/intern/bullet.c
@@ -82,6 +82,7 @@ BulletSoftBody *bsbNew(void)
 	bsb->collisionflags = 0;
 	//bsb->collisionflags = OB_BSB_COL_CL_RS + OB_BSB_COL_CL_SS;
 	bsb->numclusteriterations = 64;
+	bsb->welding = 0.f;
 
 	return bsb;
 }
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 6c9dfe4bf0a..e98d7bb01a4 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -157,7 +157,7 @@ BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 {
 	unsigned int i;
 	BVHTree *bvhtree;
-	Cloth *cloth = clmd->clothObject;
+	Cloth *cloth;
 	ClothVertex *verts;
 	MFace *mfaces;
 	float co[12];
@@ -198,7 +198,7 @@ BVHTree *bvhtree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 {
 	unsigned int i;
 	BVHTree *bvhtree;
-	Cloth *cloth = clmd->clothObject;
+	Cloth *cloth;
 	ClothVertex *verts;
 	MFace *mfaces;
 	float co[12];
@@ -787,15 +787,14 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
 	int j = 0;
 	MDeformVert *dvert = NULL;
 	Cloth *clothObj = NULL;
-	int numverts = dm->getNumVerts ( dm );
+	int numverts;
 	float goalfac = 0;
 	ClothVertex *verts = NULL;
 
+	if (!clmd || !dm) return;
+
 	clothObj = clmd->clothObject;
 
-	if ( !dm )
-		return;
-	
 	numverts = dm->getNumVerts ( dm );
 
 	verts = clothObj->verts;
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index c055a0ca6a7..a43389a2ef6 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -3430,6 +3430,8 @@ void copy_constraints (ListBase *dst, ListBase *src)
 		/* make a new copy of the constraint's data */
 		con->data = MEM_dupallocN(con->data);
 		
+		id_us_plus((ID *)con->ipo);
+		
 		/* only do specific constraints if required */
 		if (cti && cti->copy_data)
 			cti->copy_data(con, srccon);
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 8c1065c1d84..705d0b66d7f 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -33,7 +33,7 @@
 */ 
 
 #include "BKE_customdata.h"
-
+#include "BKE_utildefines.h" // CLAMP
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 #include "BLI_linklist.h"
@@ -573,6 +573,14 @@ static void layerInterp_mloopcol(void **sources, float *weights,
 			col.b += src->b * weight;
 		}
 	}
+	
+	/* Subdivide smooth or fractal can cause problems without clamping
+	 * although weights should also not cause this situation */
+	CLAMP(col.a, 0.0f, 255.0f);
+	CLAMP(col.r, 0.0f, 255.0f);
+	CLAMP(col.g, 0.0f, 255.0f);
+	CLAMP(col.b, 0.0f, 255.0f);
+	
 	mc->a = (int)col.a;
 	mc->r = (int)col.r;
 	mc->g = (int)col.g;
@@ -648,6 +656,14 @@ static void layerInterp_mcol(void **sources, float *weights,
 	}
 
 	for(j = 0; j < 4; ++j) {
+		
+		/* Subdivide smooth or fractal can cause problems without clamping
+		 * although weights should also not cause this situation */
+		CLAMP(col[j].a, 0.0f, 255.0f);
+		CLAMP(col[j].r, 0.0f, 255.0f);
+		CLAMP(col[j].g, 0.0f, 255.0f);
+		CLAMP(col[j].b, 0.0f, 255.0f);
+		
 		mc[j].a = (int)col[j].a;
 		mc[j].r = (int)col[j].r;
 		mc[j].g = (int)col[j].g;
@@ -783,7 +799,7 @@ void CustomData_merge(const struct CustomData *source, struct CustomData *dest,
 			number++;
 
 		if(layer->flag & CD_FLAG_NOCOPY) continue;
-		else if(!(mask & (1 << type))) continue;
+		else if(!((int)mask & (int)(1 << (int)type))) continue;
 		else if(number < CustomData_number_of_layers(dest, type)) continue;
 
 		if((alloctype == CD_ASSIGN) && (layer->flag & CD_FLAG_NOFREE))
@@ -1301,7 +1317,7 @@ void CustomData_set_only_copy(const struct CustomData *data,
 	int i;
 
 	for(i = 0; i < data->totlayer; ++i)
-		if(!(mask & (1 << data->layers[i].type)))
+		if(!((int)mask & (int)(1 << (int)data->layers[i].type)))
 			data->layers[i].flag |= CD_FLAG_NOCOPY;
 }
 
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 8779ed5404b..fe138407d54 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -940,7 +940,7 @@ void filldisplist(ListBase *dispbase, ListBase *to)
 	DispList *dlnew=0, *dl;
 	float *f1;
 	int colnr=0, charidx=0, cont=1, tot, a, *index;
-	long totvert;
+	intptr_t totvert;
 	
 	if(dispbase==0) return;
 	if(dispbase->first==0) return;
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 077a0c437d4..9858025af5a 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -79,7 +79,6 @@
 #include "BKE_screen.h"
 #include "BKE_utildefines.h"
 
-#include "PIL_time.h"
 #include "RE_render_ext.h"
 
 /* fluid sim particle import */
@@ -162,8 +161,7 @@ static void add_to_effectorcache(ListBase *lb, Scene *scene, Object *ob, Object
 		
 		if(pd->forcefield == PFIELD_WIND)
 		{
-			pd->rng = rng_new(1);
-			rng_srandom(pd->rng, (unsigned int)(ceil(PIL_check_seconds_timer()))); // use better seed
+			pd->rng = rng_new(pd->seed);
 		}
 	
 		ec= MEM_callocN(sizeof(pEffectorCache), "effector cache");
@@ -287,14 +285,14 @@ static float eff_calc_visibility(Scene *scene, Object *ob, float *co, float *dir
 // noise function for wind e.g.
 static float wind_func(struct RNG *rng, float strength)
 {
-	int random = (rng_getInt(rng)+1) % 65535; // max 2357
+	int random = (rng_getInt(rng)+1) % 128; // max 2357
 	float force = rng_getFloat(rng) + 1.0f;
 	float ret;
 	float sign = 0;
 	
-	sign = (random > 32000.0) ? 1.0: -1.0; // dividing by 2 is not giving equal sign distribution
+	sign = ((float)random > 64.0) ? 1.0: -1.0; // dividing by 2 is not giving equal sign distribution
 	
-	ret = sign*((float)random / force)*strength/65535.0f;
+	ret = sign*((float)random / force)*strength/128.0f;
 	
 	return ret;
 }
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 5488d50e226..929d3f942dc 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -944,7 +944,7 @@ static int iv_finddata(struct IvNode *iv, char *field, int fieldnr)
 	float *fp;
 	int len, stackcount, skipdata=0;
 	char *cpa, terminator, str[64];
-	long i;
+	intptr_t i;
 	
 	len= strlen(field);
 
@@ -2397,7 +2397,7 @@ static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
 	unsigned int kleur[32];
 	float co[3];
 	int a;
-	long tot;
+	intptr_t tot;
 	char *cp;
 	
 	if(ob && ob->type==OB_MESH);
@@ -2447,17 +2447,17 @@ static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
 
 			if(evl->v4==0) {
 				fprintf(fp, "3 %ld %ld %ld 0x%x\n", 
-						(long int) evl->v1->tmp.l,
-						(long int) evl->v2->tmp.l,
-						(long int) evl->v3->tmp.l, 
+						(intptr_t) evl->v1->tmp.l,
+						(intptr_t) evl->v2->tmp.l,
+						(intptr_t) evl->v3->tmp.l, 
 						kleur[evl->mat_nr]);
 			}
 			else {
 				fprintf(fp, "4 %ld %ld %ld %ld 0x%x\n", 
-						(long int) evl->v1->tmp.l, 
-						(long int) evl->v2->tmp.l, 
-						(long int) evl->v3->tmp.l, 
-						(long int) evl->v4->tmp.l, 
+						(intptr_t) evl->v1->tmp.l, 
+						(intptr_t) evl->v2->tmp.l, 
+						(intptr_t) evl->v3->tmp.l, 
+						(intptr_t) evl->v4->tmp.l, 
 						kleur[evl->mat_nr]);
 			}
 			evl= evl->next;
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index b94652eb7c3..c3cf6e06c09 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -1144,14 +1144,12 @@ struct chartrans *BKE_text_to_curve(Scene *scene, Object *ob, int mode)
 		ct= chartransdata;
 		if (cu->sepchar==0) {
 			for (i= 0; i<slen; i++) {
-				cha = (unsigned long) mem[i];
-				info = &(custrinfo[i]);
-				
+				cha = (uintptr_t) mem[i];
+				info = &(cu->strinfo[i]);
 				if (info->mat_nr > (ob->totcol)) {
 					/* printf("Error: Illegal material index (%d) in text object, setting to 0\n", info->mat_nr); */
 					info->mat_nr = 0;
 				}
-				
 				// We do not want to see any character for \n or \r
 				if(cha != '\n' && cha != '\r')
 					buildchar(cu, cha, info, ct->xof, ct->yof, ct->rot, i);
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 629f34518b9..8eef9984c92 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -433,7 +433,7 @@ static ImBuf *add_ibuf_size(int width, int height, char *name, int floatbuf, sho
 	unsigned char *rect= NULL;
 	float *rect_float= NULL;
 	int x, y;
-	int checkerwidth=21, dark=1;
+	int checkerwidth=32, dark=1;
 	
 	if (floatbuf) {
 		ibuf= IMB_allocImBuf(width, height, 24, IB_rectfloat, 0);
@@ -668,6 +668,11 @@ static uintptr_t image_mem_size(Image *ima)
 	uintptr_t size = 0;
 
 	size= 0;
+	
+	/* viewers have memory depending on other rules, has no valid rect pointer */
+	if(ima->source==IMA_SRC_VIEWER)
+		return 0;
+	
 	for(ibuf= ima->ibufs.first; ibuf; ibuf= ibuf->next) {
 		if(ibuf->rect) size += MEM_allocN_len(ibuf->rect);
 		else if(ibuf->rect_float) size += MEM_allocN_len(ibuf->rect_float);
@@ -1052,7 +1057,7 @@ static void stampdata(Scene *scene, StampData *stamp_data, int do_prefix)
 	}
 	
 	if (scene->r.stamp & R_STAMP_SEQSTRIP) {
-		Sequence *seq= NULL; //XXX = get_forground_frame_seq(scene->r.cfra);
+		Sequence *seq= NULL; //XXX = get_foreground_frame_seq(scene->r.cfra);
 	
 		if (seq) strcpy(text, seq->name+2);
 		else 		strcpy(text, "<none>");
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 9c5560be8f3..8cbf25eaeed 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1741,3 +1741,4 @@ void do_versions_ipos_to_animato(Main *main)
 	
 	printf("INFO: Animato convert done \n"); // xxx debug
 }
+
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 3e881f2d871..74d56e81a87 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -296,7 +296,10 @@ Object *find_basis_mball(Scene *scene, Object *basis)
 	splitIDname(basis->id.name+2, basisname, &basisnr);
 	totelem= 0;
 
-	next_object(scene, 0, 0, 0);
+	/* XXX recursion check, see scene.c, just too simple code this next_object() */
+	if(F_ERROR==next_object(scene, 0, 0, 0))
+		return NULL;
+	
 	while(next_object(scene, 1, &base, &ob)) {
 		
 		if (ob->type==OB_MBALL) {
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index e8427a973d0..6ebd68e990f 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -6265,6 +6265,48 @@ static int is_last_displist(Object *ob)
 
 	return 0;
 }
+
+static DerivedMesh *get_original_dm(Scene *scene, Object *ob, float (*vertexCos)[3], int orco)
+{
+	DerivedMesh *dm= NULL;
+
+	if(ob->type==OB_MESH) {
+		dm = CDDM_from_mesh((Mesh*)(ob->data), ob);
+
+		if(vertexCos) {
+			CDDM_apply_vert_coords(dm, vertexCos);
+			//CDDM_calc_normals(dm);
+		}
+		
+		if(orco)
+			DM_add_vert_layer(dm, CD_ORCO, CD_ASSIGN, get_mesh_orco_verts(ob));
+	}
+	else if(ELEM3(ob->type,OB_FONT,OB_CURVE,OB_SURF)) {
+		Object *tmpobj;
+		Curve *tmpcu;
+
+		if(is_last_displist(ob)) {
+			/* copies object and modifiers (but not the data) */
+			tmpobj= copy_object(ob);
+			tmpcu = (Curve *)tmpobj->data;
+			tmpcu->id.us--;
+
+			/* copies the data */
+			tmpobj->data = copy_curve((Curve *) ob->data);
+
+			makeDispListCurveTypes(scene, tmpobj, 1);
+			nurbs_to_mesh(tmpobj);
+
+			dm = CDDM_from_mesh((Mesh*)(tmpobj->data), tmpobj);
+			//CDDM_calc_normals(dm);
+
+			free_libblock_us(&G.main->object, tmpobj);
+		}
+	}
+
+	return dm;
+}
+
 /* saves the current emitter state for a particle system and calculates particles */
 static void particleSystemModifier_deformVerts(
 					       ModifierData *md, Object *ob, DerivedMesh *derivedData,
@@ -6283,43 +6325,13 @@ static void particleSystemModifier_deformVerts(
 	if(!psys_check_enabled(ob, psys))
 		return;
 
-	if(dm==0){
-		if(ob->type==OB_MESH){
-			dm = CDDM_from_mesh((Mesh*)(ob->data), ob);
-
-			CDDM_apply_vert_coords(dm, vertexCos);
-			//CDDM_calc_normals(dm);
-			
-			DM_add_vert_layer(dm, CD_ORCO, CD_ASSIGN, get_mesh_orco_verts(ob));
-
-			needsFree=1;
-		}
-		else if(ELEM3(ob->type,OB_FONT,OB_CURVE,OB_SURF)){
-			Object *tmpobj;
-			Curve *tmpcu;
-
-			if(is_last_displist(ob)){
-				/* copies object and modifiers (but not the data) */
-				tmpobj= copy_object( ob );
-				tmpcu = (Curve *)tmpobj->data;
-				tmpcu->id.us--;
-
-				/* copies the data */
-				tmpobj->data = copy_curve( (Curve *) ob->data );
-
-				makeDispListCurveTypes(md->scene, tmpobj, 1 );
-				nurbs_to_mesh( tmpobj );
+	if(dm==0) {
+		dm= get_original_dm(md->scene, ob, vertexCos, 1);
 
-				dm = CDDM_from_mesh((Mesh*)(tmpobj->data), tmpobj);
-				//CDDM_calc_normals(dm);
-
-				free_libblock_us( &G.main->object, tmpobj );
+		if(!dm)
+			return;
 
-				needsFree=1;
-			}
-			else return;
-		}
-		else return;
+		needsFree= 1;
 	}
 
 	/* clear old dm */
@@ -7658,6 +7670,14 @@ static void meshdeformModifier_do(
 	}
 	else
 		cagedm= mmd->object->derivedFinal;
+
+	/* if we don't have one computed, use derivedmesh from data
+	 * without any modifiers */
+	if(!cagedm) {
+		cagedm= get_original_dm(md->scene, mmd->object, NULL, 0);
+		if(cagedm)
+			cagedm->needsFree= 1;
+	}
 	
 	if(!cagedm)
 		return;
@@ -7951,7 +7971,7 @@ static void shrinkwrapModifier_deformVerts(ModifierData *md, Object *ob, Derived
 		else if(ob->type==OB_LATTICE) dm = NULL;
 		else return;
 
-		if(dm != NULL && (dataMask & CD_MVERT))
+		if(dm != NULL && (dataMask & (1<<CD_MVERT)))
 		{
 			CDDM_apply_vert_coords(dm, vertexCos);
 			CDDM_calc_normals(dm);
@@ -7976,7 +7996,7 @@ static void shrinkwrapModifier_deformVertsEM(ModifierData *md, Object *ob, EditM
 		else if(ob->type==OB_LATTICE) dm = NULL;
 		else return;
 
-		if(dm != NULL && (dataMask & CD_MVERT))
+		if(dm != NULL && (dataMask & (1<<CD_MVERT)))
 		{
 			CDDM_apply_vert_coords(dm, vertexCos);
 			CDDM_calc_normals(dm);
@@ -8906,8 +8926,10 @@ void modifier_freeTemporaryData(ModifierData *md)
 	if(md->type == eModifierType_Armature) {
 		ArmatureModifierData *amd= (ArmatureModifierData*)md;
 
-		if(amd->prevCos)
+		if(amd->prevCos) {
 			MEM_freeN(amd->prevCos);
+			amd->prevCos= NULL;
+		}
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 43df11335fe..a83b8817580 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1990,9 +1990,9 @@ static void group_tag_used_outputs(bNode *gnode, bNodeStack *stack)
 	}
 }
 
+/* notes below are ancient! (ton) */
 /* stack indices make sure all nodes only write in allocated data, for making it thread safe */
 /* only root tree gets the stack, to enable instances to have own stack entries */
-/* only two threads now! */
 /* per tree (and per group) unique indices are created */
 /* the index_ext we need to be able to map from groups to the group-node own stack */
 
@@ -2007,14 +2007,9 @@ static bNodeThreadStack *ntreeGetThreadStack(bNodeTree *ntree, int thread)
 	ListBase *lb= &ntree->threadstack[thread];
 	bNodeThreadStack *nts;
 	
-	/* for material shading this is called quite a lot (perhaps too much locking unlocking)
-	 * however without locking we get bug #18058 - Campbell */
-	BLI_lock_thread(LOCK_CUSTOM1); 
-	
 	for(nts=lb->first; nts; nts=nts->next) {
 		if(!nts->used) {
 			nts->used= 1;
-			BLI_unlock_thread(LOCK_CUSTOM1);
 			return nts;
 		}
 	}
@@ -2022,7 +2017,7 @@ static bNodeThreadStack *ntreeGetThreadStack(bNodeTree *ntree, int thread)
 	nts->stack= MEM_dupallocN(ntree->stack);
 	nts->used= 1;
 	BLI_addtail(lb, nts);
-	BLI_unlock_thread(LOCK_CUSTOM1);
+
 	return nts;
 }
 
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index d7619010808..81bd78f1851 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -977,6 +977,8 @@ Object *add_only_object(int type, char *name)
 	ob->anisotropicFriction[2] = 1.0f;
 	ob->gameflag= OB_PROP|OB_COLLISION;
 	ob->margin = 0.0;
+	/* ob->pad3 == Contact Processing Threshold */
+	ob->m_contactProcessingThreshold = 1.;
 	
 	/* NT fluid sim defaults */
 	ob->fluidsimFlag = 0;
@@ -1131,6 +1133,9 @@ static void copy_object_pose(Object *obn, Object *ob)
 			 * is changed to object->proxy_from when evaluating the driver. */
 			if(con->ipo && !con->ipo->id.lib) {
 				IpoCurve *icu;
+				
+				con->ipo= copy_ipo(con->ipo);
+				
 				for(icu= con->ipo->curve.first; icu; icu= icu->next) {
 					if(icu->driver && icu->driver->ob==ob)
 						icu->driver->ob= obn;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 6cef9959d8b..74a754c0ca8 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -348,15 +348,17 @@ void free_hair(ParticleSystem *psys, int softbody)
 }
 void free_keyed_keys(ParticleSystem *psys)
 {
-	if(psys->particles && psys->particles->keys) {
-		ParticleData *pa;
-		int i, totpart=psys->totpart;
+	ParticleData *pa;
+	int i;
 
+	if(psys->particles && psys->particles->keys) {
 		MEM_freeN(psys->particles->keys);
 
-		for(i=0, pa=psys->particles; i<totpart; i++,pa++){
-			pa->keys = NULL;
-			pa->totkey = 0;
+		for(i=0, pa=psys->particles; i<psys->totpart; i++, pa++) {
+			if(pa->keys) {
+				pa->keys= NULL;
+				pa->totkey= 0;
+			}
 		}
 	}
 }
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index f097af279b6..c0ef92b489e 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -196,8 +196,11 @@ static void realloc_particles(Object *ob, ParticleSystem *psys, int new_totpart)
 		if(psys->particles->keys)
 			MEM_freeN(psys->particles->keys);
 
-		for(i=0, pa=psys->particles; i<totsaved; i++, pa++)
-			if(pa->keys) pa->keys= NULL;
+		for(i=0, pa=psys->particles; i<psys->totpart; i++, pa++)
+			if(pa->keys) {
+				pa->keys= NULL;
+				pa->totkey= 0;
+			}
 
 		for(i=totsaved, pa=psys->particles+totsaved; i<psys->totpart; i++, pa++)
 			if(pa->hair) MEM_freeN(pa->hair);
@@ -2010,7 +2013,6 @@ static void set_keyed_keys(Scene *scene, Object *ob, ParticleSystem *psys)
 	Object *kob = ob;
 	ParticleSystem *kpsys = psys;
 	ParticleData *pa;
-	ParticleKey state;
 	int totpart = psys->totpart, i, k, totkeys = psys->totkeyed + 1;
 	float prevtime, nexttime, keyedtime;
 
@@ -2034,10 +2036,11 @@ static void set_keyed_keys(Scene *scene, Object *ob, ParticleSystem *psys)
 	}
 	
 	psys->flag &= ~PSYS_KEYED;
-	state.time=-1.0;
 
 	for(k=0; k<totkeys; k++) {
 		for(i=0,pa=psys->particles; i<totpart; i++, pa++) {
+			(pa->keys + k)->time = -1.0; /* use current time */
+
 			if(kpsys->totpart > 0)
 				psys_get_particle_state(scene, kob, kpsys, i%kpsys->totpart, pa->keys + k, 1);
 
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index e8c6c5c199f..74d2347ec39 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -134,7 +134,7 @@ void init_sensor(bSensor *sens)
 	
 	switch(sens->type) {
 	case SENS_ALWAYS:
-		sens->pulse = 1;
+		sens->pulse = 0;
 		break;
 	case SENS_TOUCH:
 		sens->data= MEM_callocN(sizeof(bTouchSensor), "touchsens");
@@ -579,6 +579,10 @@ void set_sca_new_poins_ob(Object *ob)
 				bCameraActuator *ca= act->data;
 				ID_NEW(ca->ob);
 			}
+			else if(act->type==ACT_OBJECT) {
+				bObjectActuator *oa= act->data;
+				ID_NEW(oa->reference);
+			}
 			else if(act->type==ACT_SCENE) {
 				bSceneActuator *sca= act->data;
 				ID_NEW(sca->camera);
@@ -606,6 +610,7 @@ void sca_remove_ob_poin(Object *obt, Object *ob)
 	bMessageSensor *ms;
 	bActuator *act;
 	bCameraActuator *ca;
+	bObjectActuator *oa;
 	bSceneActuator *sa;
 	bEditObjectActuator *eoa;
 	bPropertyActuator *pa;
@@ -628,6 +633,10 @@ void sca_remove_ob_poin(Object *obt, Object *ob)
 			ca= act->data;
 			if(ca->ob==ob) ca->ob= NULL;
 			break;
+		case ACT_OBJECT:
+			oa= act->data;
+			if(oa->reference==ob) oa->reference= NULL;
+			break;
 		case ACT_PROPERTY:
 			pa= act->data;
 			if(pa->ob==ob) pa->ob= NULL;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 5c936c3ab39..156bdae9b00 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -245,9 +245,9 @@ Scene *add_scene(char *name)
 	sce->r.stereomode = 1;  // no stereo
 	sce->r.domeangle = 180;
 	sce->r.domemode = 1;
-	sce->r.domesize = 1.0f;
 	sce->r.domeres = 4;
 	sce->r.domeresbuf = 1.0f;
+	sce->r.dometilt = 0;
 
 	sce->r.simplify_subsurf= 6;
 	sce->r.simplify_particles= 1.0f;
@@ -411,16 +411,25 @@ int next_object(Scene *scene, int val, Base **base, Object **ob)
 {
 	static ListBase *duplilist= NULL;
 	static DupliObject *dupob;
-	static int fase;
+	static int fase= F_START, in_next_object= 0;
 	int run_again=1;
 	
 	/* init */
 	if(val==0) {
 		fase= F_START;
 		dupob= NULL;
+		
+		/* XXX particle systems with metas+dupligroups call this recursively */
+		/* see bug #18725 */
+		if(in_next_object) {
+			printf("ERROR: MetaBall generation called recursively, not supported\n");
+			
+			return F_ERROR;
+		}
 	}
 	else {
-
+		in_next_object= 1;
+		
 		/* run_again is set when a duplilist has been ended */
 		while(run_again) {
 			run_again= 0;
@@ -502,6 +511,9 @@ int next_object(Scene *scene, int val, Base **base, Object **ob)
 		}
 	}
 	
+	/* reset recursion test */
+	in_next_object= 0;
+	
 	return fase;
 }
 
@@ -723,4 +735,4 @@ void free_dome_warp_text(struct Text *txt)
 			scene->r.dometext = NULL;
 		scene = scene->id.next;
 	}
-}
\ No newline at end of file
+}
diff --git a/source/blender/blenkernel/intern/sequence.c b/source/blender/blenkernel/intern/sequence.c
index 121dfce4980..3365af36f8c 100644
--- a/source/blender/blenkernel/intern/sequence.c
+++ b/source/blender/blenkernel/intern/sequence.c
@@ -122,6 +122,14 @@ void new_tstripdata(Sequence *seq)
 
 /* free */
 
+static void free_proxy_seq(Sequence *seq)
+{
+	if (seq->strip && seq->strip->proxy && seq->strip->proxy->anim) {
+		IMB_free_anim(seq->strip->proxy->anim);
+		seq->strip->proxy->anim = 0;
+	}
+}
+
 void seq_free_strip(Strip *strip)
 {
 	strip->us--;
@@ -136,6 +144,10 @@ void seq_free_strip(Strip *strip)
 	}
 
 	if (strip->proxy) {
+		if (strip->proxy->anim) {
+			IMB_free_anim(strip->proxy->anim);
+		}
+
 		MEM_freeN(strip->proxy);
 	}
 	if (strip->crop) {
@@ -598,6 +610,8 @@ void reload_sequence_new_file(Scene *scene, Sequence * seq)
 		seq->strip->len = seq->len;
 	}
 
+	free_proxy_seq(seq);
+
 	calc_sequence(seq);
 }
 
@@ -1112,7 +1126,7 @@ static int get_shown_sequences(	ListBase * seqbasep, int cfra, int chanshown, Se
 
 #define PROXY_MAXFILE (2*FILE_MAXDIR+FILE_MAXFILE)
 
-static int seq_proxy_get_fname(Scene *scene, Sequence * seq, int cfra, char * name)
+static int seq_proxy_get_fname(Scene *scene, Sequence * seq, int cfra, char * name, int render_size)
 {
 	int frameno;
 	char dir[FILE_MAXDIR];
@@ -1132,12 +1146,20 @@ static int seq_proxy_get_fname(Scene *scene, Sequence * seq, int cfra, char * na
 		}
 	}
 
+	if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) {
+		BLI_join_dirfile(name, dir, seq->strip->proxy->file);
+		BLI_convertstringcode(name, G.sce);
+		BLI_convertstringframe(name, cfra);
+
+		return TRUE;
+	}
+
 	/* generate a seperate proxy directory for each preview size */
 
 	if (seq->type == SEQ_IMAGE) {
 		StripElem * se = give_stripelem(seq, cfra);
 		snprintf(name, PROXY_MAXFILE, "%s/images/%d/%s_proxy",
-			 dir, scene->r.size, se->name);
+			 dir, render_size, se->name);
 		frameno = 1;
 	} else if (seq->type == SEQ_MOVIE) {
 		TStripElem * tse = give_tstripelem(seq, cfra);
@@ -1146,14 +1168,14 @@ static int seq_proxy_get_fname(Scene *scene, Sequence * seq, int cfra, char * na
 
 		snprintf(name, PROXY_MAXFILE, "%s/%s/%d/####", dir,
 			 seq->strip->stripdata->name,
-			 scene->r.size);
+			 render_size);
 	} else {
 		TStripElem * tse = give_tstripelem(seq, cfra);
 
 		frameno = tse->nr + seq->anim_startofs;
 
 		snprintf(name, PROXY_MAXFILE, "%s/proxy_misc/%d/####", dir,
-			 scene->r.size);
+			 render_size);
 	}
 
 	BLI_convertstringcode(name, G.sce);
@@ -1165,7 +1187,7 @@ static int seq_proxy_get_fname(Scene *scene, Sequence * seq, int cfra, char * na
 	return TRUE;
 }
 
-static struct ImBuf * seq_proxy_fetch(Scene *scene, Sequence * seq, int cfra)
+static struct ImBuf * seq_proxy_fetch(Scene *scene, Sequence * seq, int cfra, int render_size)
 {
 	char name[PROXY_MAXFILE];
 
@@ -1174,11 +1196,28 @@ static struct ImBuf * seq_proxy_fetch(Scene *scene, Sequence * seq, int cfra)
 	}
 
 	/* rendering at 100% ? No real sense in proxy-ing, right? */
-	if (scene->r.size == 100.0) {
+	if (render_size == 100) {
 		return 0;
 	}
 
-	if (!seq_proxy_get_fname(scene, seq, cfra, name)) {
+	if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) {
+		TStripElem * tse = give_tstripelem(seq, cfra);
+		int frameno = tse->nr + seq->anim_startofs;
+		if (!seq->strip->proxy->anim) {
+			if (!seq_proxy_get_fname(scene, seq, cfra, name, render_size)) {
+				return 0;
+			}
+ 
+			seq->strip->proxy->anim = openanim(name, IB_rect);
+		}
+		if (!seq->strip->proxy->anim) {
+			return 0;
+		}
+ 
+		return IMB_anim_absolute(seq->strip->proxy->anim, frameno);
+	}
+ 
+	if (!seq_proxy_get_fname(scene, seq, cfra, name, render_size)) {
 		return 0;
 	}
 
@@ -1190,9 +1229,9 @@ static struct ImBuf * seq_proxy_fetch(Scene *scene, Sequence * seq, int cfra)
 }
 
 static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int cfra,
-			      int build_proxy_run);
+			      int build_proxy_run, int render_size);
 
-static void seq_proxy_build_frame(Scene *scene, Sequence * seq, int cfra)
+static void seq_proxy_build_frame(Scene *scene, Sequence * seq, int cfra, int render_size)
 {
 	char name[PROXY_MAXFILE];
 	int quality;
@@ -1206,11 +1245,16 @@ static void seq_proxy_build_frame(Scene *scene, Sequence * seq, int cfra)
 	}
 
 	/* rendering at 100% ? No real sense in proxy-ing, right? */
-	if (scene->r.size == 100.0) {
+	if (render_size == 100) {
 		return;
 	}
 
-	if (!seq_proxy_get_fname(scene, seq, cfra, name)) {
+	/* that's why it is called custom... */
+	if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) {
+		return;
+    }
+
+	if (!seq_proxy_get_fname(scene, seq, cfra, name, render_size)) {
 		return;
 	}
 
@@ -1224,14 +1268,14 @@ static void seq_proxy_build_frame(Scene *scene, Sequence * seq, int cfra)
 		se->ibuf = 0;
 	}
 	
-	do_build_seq_ibuf(scene, seq, se, cfra, TRUE);
+	do_build_seq_ibuf(scene, seq, se, cfra, TRUE, render_size);
 
 	if (!se->ibuf) {
 		return;
 	}
 
-	rectx= (scene->r.size*scene->r.xsch)/100;
-	recty= (scene->r.size*scene->r.ysch)/100;
+	rectx= (render_size*scene->r.xsch)/100;
+	recty= (render_size*scene->r.ysch)/100;
 
 	ibuf = se->ibuf;
 
@@ -1286,7 +1330,7 @@ void seq_proxy_rebuild(Scene *scene, Sequence * seq)
 			TStripElem * tse = give_tstripelem(seq, cfra);
 
 			if (!(tse->flag & STRIPELEM_PREVIEW_DONE)) {
-				seq_proxy_build_frame(scene, seq, cfra);
+				seq_proxy_build_frame(scene, seq, cfra, scene->r.size);
 				tse->flag |= STRIPELEM_PREVIEW_DONE;
 			}
 			if (blender_test_break()) {
@@ -1299,7 +1343,7 @@ void seq_proxy_rebuild(Scene *scene, Sequence * seq)
 			TStripElem * tse = give_tstripelem(seq, cfra);
 
 			if (!(tse->flag & STRIPELEM_PREVIEW_DONE)) {
-				seq_proxy_build_frame(scene, seq, cfra);
+				seq_proxy_build_frame(scene, seq, cfra, scene->r.size);
 				tse->flag |= STRIPELEM_PREVIEW_DONE;
 			}
 			if (blender_test_break()) {
@@ -1752,11 +1796,46 @@ static void free_metastrip_imbufs(ListBase *seqbasep, int cfra, int chanshown)
 	
 }
 
+static void check_limiter_refcount(const char * func, TStripElem *se)
+{
+	if (se && se->ibuf) {
+		int refcount = IMB_cache_limiter_get_refcount(se->ibuf);
+		if (refcount != 1) {
+			/* can happen on complex pipelines */
+			if (refcount > 1 && (G.f & G_DEBUG) == 0) {
+				return;
+			}
+ 
+			fprintf(stderr, 
+				"sequencer: (ibuf) %s: "
+				"suspicious memcache "
+				"limiter refcount: %d\n", func, refcount);
+		}
+	}
+}
+ 
+static void check_limiter_refcount_comp(const char * func, TStripElem *se)
+{
+	if (se && se->ibuf_comp) {
+		int refcount = IMB_cache_limiter_get_refcount(se->ibuf_comp);
+		if (refcount != 1) {
+			/* can happen on complex pipelines */
+			if (refcount > 1 && (G.f & G_DEBUG) == 0) {
+				return;
+			}
+			fprintf(stderr, 
+				"sequencer: (ibuf comp) %s: "
+				"suspicious memcache "
+				"limiter refcount: %d\n", func, refcount);
+		}
+	}
+}
+
 static TStripElem* do_build_seq_array_recursively(Scene *scene,
-				ListBase *seqbasep, int cfra, int chanshown);
+				ListBase *seqbasep, int cfra, int chanshown, int render_size);
 
 static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int cfra,
-			      int build_proxy_run)
+			      int build_proxy_run, int render_size)
 {
 	char name[FILE_MAXDIR+FILE_MAXFILE];
 	int use_limiter = TRUE;
@@ -1766,18 +1845,23 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 
 	if(seq->type == SEQ_META) {
 		TStripElem * meta_se = 0;
+		int use_preprocess = FALSE;
 		use_limiter = FALSE;
 
 		if (!build_proxy_run && se->ibuf == 0) {
-			se->ibuf = seq_proxy_fetch(scene, seq, cfra);
+			se->ibuf = seq_proxy_fetch(scene, seq, cfra, render_size);
 			if (se->ibuf) {
 				use_limiter = TRUE;
+				use_preprocess = TRUE;
 			}
 		}
 
 		if(!se->ibuf && seq->seqbase.first) {
 			meta_se = do_build_seq_array_recursively(scene,
-				&seq->seqbase, seq->start + se->nr, 0);
+				&seq->seqbase, seq->start + se->nr, 0,
+				render_size);
+
+			check_limiter_refcount("do_build_seq_ibuf: for META", meta_se);
 		}
 
 		se->ok = STRIPELEM_OK;
@@ -1799,21 +1883,24 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 				se->ibuf = i;
 
 				use_limiter = TRUE;
+				use_preprocess = TRUE;
 			}
+		} else if (se->ibuf) {
+			use_limiter = TRUE;
 		}
 		if (meta_se) {
 			free_metastrip_imbufs(
 				&seq->seqbase, seq->start + se->nr, 0);
 		}
 
-		if (use_limiter) {
+		if (use_preprocess) {
 			input_preprocess(scene, seq, se, cfra);
 		}
 	} else if(seq->type & SEQ_EFFECT) {
 		/* should the effect be recalculated? */
 		
 		if (!build_proxy_run && se->ibuf == 0) {
-			se->ibuf = seq_proxy_fetch(scene, seq, cfra);
+			se->ibuf = seq_proxy_fetch(scene, seq, cfra, render_size);
 		}
 
 		if(se->ibuf == 0) {
@@ -1834,13 +1921,19 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 			BLI_convertstringcode(name, G.sce);
 			BLI_convertstringframe(name, scene->r.cfra);
 			if (!build_proxy_run) {
-				se->ibuf = seq_proxy_fetch(scene, seq, cfra);
+				se->ibuf = seq_proxy_fetch(scene, seq, cfra, render_size);
 			}
 			copy_from_ibuf_still(seq, se);
 
 			if (!se->ibuf) {
 				se->ibuf= IMB_loadiffname(
 					name, IB_rect);
+				/* we don't need both (speed reasons)! */
+				if (se->ibuf &&
+					se->ibuf->rect_float && se->ibuf->rect) {
+					imb_freerectImBuf(se->ibuf);
+				}
+
 				copy_to_ibuf_still(seq, se);
 			}
 			
@@ -1853,7 +1946,7 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 	} else if(seq->type == SEQ_MOVIE) {
 		if(se->ok == STRIPELEM_OK && se->ibuf==0) {
 			if(!build_proxy_run) {
-				se->ibuf = seq_proxy_fetch(scene, seq, cfra);
+				se->ibuf = seq_proxy_fetch(scene, seq, cfra, render_size);
 			}
 			copy_from_ibuf_still(seq, se);
 
@@ -1871,6 +1964,13 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 				if(seq->anim) {
 					IMB_anim_set_preseek(seq->anim, seq->anim_preseek);
 					se->ibuf = IMB_anim_absolute(seq->anim, se->nr + seq->anim_startofs);
+					/* we don't need both (speed reasons)! */
+					if (se->ibuf 
+					    && se->ibuf->rect_float 
+					    && se->ibuf->rect) {
+						imb_freerectImBuf(se->ibuf);
+					}
+
 				}
 				copy_to_ibuf_still(seq, se);
 			}
@@ -1894,7 +1994,7 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 		int sce_valid =sce&& (sce->camera || sce->r.scemode & R_DOSEQ);
 			
 		if (se->ibuf == NULL && sce_valid && !build_proxy_run) {
-			se->ibuf = seq_proxy_fetch(scene, seq, cfra);
+			se->ibuf = seq_proxy_fetch(scene, seq, cfra, render_size);
 			if (se->ibuf) {
 				input_preprocess(scene, seq, se, cfra);
 			}
@@ -1910,7 +2010,10 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 		if (!sce_valid) {
 			se->ok = STRIPELEM_FAILED;
 		} else if (se->ibuf==NULL && sce_valid) {
-			waitcursor(1);
+			/* no need to display a waitcursor on sequencer
+			   scene strips */
+			if (!(sce->r.scemode & R_DOSEQ)) 
+				waitcursor(1);
 			
 			/* Hack! This function can be called from do_render_seq(), in that case
 			   the seq->scene can already have a Render initialized with same name, 
@@ -1960,6 +2063,13 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 			
 			/* restore */
 			scene->r.scemode |= doseq;
+
+			// XXX
+#if 0
+			if((G.f & G_PLAYANIM)==0 /* bad, is set on do_render_seq */
+				&& !(sce->r.scemode & R_DOSEQ)) 
+				waitcursor(0);
+#endif
 			
 			CFRA = oldcfra;
 			set_last_seq(oldseq);
@@ -1986,9 +2096,9 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 	}
 }
 
-static TStripElem* do_build_seq_recursively(Scene *scene, Sequence *seq, int cfra);
+static TStripElem* do_build_seq_recursively(Scene *scene, Sequence *seq, int cfra, int render_size);
 
-static void do_effect_seq_recursively(Scene *scene, Sequence *seq, TStripElem *se, int cfra)
+static void do_effect_seq_recursively(Scene *scene, Sequence *seq, TStripElem *se, int cfra, int render_size)
 {
 	float fac, facf;
 	struct SeqEffectHandle sh = get_sequence_effect(seq);
@@ -2017,22 +2127,22 @@ static void do_effect_seq_recursively(Scene *scene, Sequence *seq, TStripElem *s
 		/* no input needed */
 		break;
 	case 0:
-		se->se1 = do_build_seq_recursively(scene, seq->seq1, cfra);
-		se->se2 = do_build_seq_recursively(scene, seq->seq2, cfra);
+		se->se1 = do_build_seq_recursively(scene, seq->seq1, cfra, render_size);
+		se->se2 = do_build_seq_recursively(scene, seq->seq2, cfra, render_size);
 		if (seq->seq3) {
-			se->se3 = do_build_seq_recursively(scene, seq->seq3, cfra);
+			se->se3 = do_build_seq_recursively(scene, seq->seq3, cfra, render_size);
 		}
 		break;
 	case 1:
-		se->se1 = do_build_seq_recursively(scene, seq->seq1, cfra);
+		se->se1 = do_build_seq_recursively(scene, seq->seq1, cfra, render_size);
 		break;
 	case 2:
-		se->se2 = do_build_seq_recursively(scene, seq->seq2, cfra);
+		se->se2 = do_build_seq_recursively(scene, seq->seq2, cfra, render_size);
 		break;
 	}
 
 
-	do_build_seq_ibuf(scene, seq, se, cfra, FALSE);
+	do_build_seq_ibuf(scene, seq, se, cfra, FALSE, render_size);
 
 	/* children are not needed anymore ... */
 
@@ -2045,9 +2155,10 @@ static void do_effect_seq_recursively(Scene *scene, Sequence *seq, TStripElem *s
 	if (se->se3 && se->se3->ibuf) {
 		IMB_cache_limiter_unref(se->se3->ibuf);
 	}
+	check_limiter_refcount("do_effect_seq_recursively", se);
 }
 
-static TStripElem* do_build_seq_recursively_impl(Scene *scene, Sequence * seq, int cfra)
+static TStripElem* do_build_seq_recursively_impl(Scene *scene, Sequence * seq, int cfra, int render_size)
 {
 	TStripElem *se;
 
@@ -2055,9 +2166,9 @@ static TStripElem* do_build_seq_recursively_impl(Scene *scene, Sequence * seq, i
 
 	if(se) {
 		if (seq->type & SEQ_EFFECT) {
-			do_effect_seq_recursively(scene, seq, se, cfra);
+			do_effect_seq_recursively(scene, seq, se, cfra, render_size);
 		} else {
-			do_build_seq_ibuf(scene, seq, se, cfra, FALSE);
+			do_build_seq_ibuf(scene, seq, se, cfra, FALSE, render_size);
 		}
 	}
 	return se;
@@ -2071,7 +2182,7 @@ instead of faking using the blend code below...
 
 */
 
-static TStripElem* do_handle_speed_effect(Scene *scene, Sequence * seq, int cfra)
+static TStripElem* do_handle_speed_effect(Scene *scene, Sequence * seq, int cfra, int render_size)
 {
 	SpeedControlVars * s = (SpeedControlVars *)seq->effectdata;
 	int nr = cfra - seq->start;
@@ -2100,7 +2211,7 @@ static TStripElem* do_handle_speed_effect(Scene *scene, Sequence * seq, int cfra
 		test_and_auto_discard_ibuf(se);
 
 		if (se->ibuf == NULL) {
-			se1 = do_build_seq_recursively_impl(scene, seq->seq1, cfra_left);
+			se1 = do_build_seq_recursively_impl(scene, seq->seq1, cfra_left, render_size);
 
 			if((se1 && se1->ibuf && se1->ibuf->rect_float))
 				se->ibuf= IMB_allocImBuf((short)seqrectx, (short)seqrecty, 32, IB_rectfloat, 0);
@@ -2132,8 +2243,8 @@ static TStripElem* do_handle_speed_effect(Scene *scene, Sequence * seq, int cfra
 		}
 
 		if (se->ibuf == NULL) {
-			se1 = do_build_seq_recursively_impl(scene, seq->seq1, cfra_left);
-			se2 = do_build_seq_recursively_impl(scene, seq->seq1, cfra_right);
+			se1 = do_build_seq_recursively_impl(scene, seq->seq1, cfra_left, render_size);
+			se2 = do_build_seq_recursively_impl(scene, seq->seq1, cfra_right, render_size);
 
 			if((se1 && se1->ibuf && se1->ibuf->rect_float))
 				se->ibuf= IMB_allocImBuf((short)seqrectx, (short)seqrecty, 32, IB_rectfloat, 0);
@@ -2168,6 +2279,8 @@ static TStripElem* do_handle_speed_effect(Scene *scene, Sequence * seq, int cfra
 	if (se2 && se2->ibuf)
 		IMB_cache_limiter_unref(se2->ibuf);
 
+	check_limiter_refcount("do_handle_speed_effect", se);
+
 	return se;
 }
 
@@ -2183,25 +2296,22 @@ static TStripElem* do_handle_speed_effect(Scene *scene, Sequence * seq, int cfra
  * 
  */
 
-static TStripElem* do_build_seq_recursively(Scene *scene, Sequence * seq, int cfra)
+static TStripElem* do_build_seq_recursively(Scene *scene, Sequence * seq, int cfra, int render_size)
 {
+	TStripElem *se;
 	if (seq->type == SEQ_SPEED) {
-		return do_handle_speed_effect(scene, seq, cfra);
+		se = do_handle_speed_effect(scene, seq, cfra, render_size);
 	} else {
-		return do_build_seq_recursively_impl(scene, seq, cfra);
+		se = do_build_seq_recursively_impl(scene, seq, cfra, render_size);
 	}
-}
 
-/* Bug: 18209
- * when dragging the mouse over a metastrip, on mouse-up for some unknown
- * reason in some cases the metastrips TStripElem->ibuf->rect is NULL,
- * This should be fixed but I had a look and couldnt work out why its
- * happening so for now workaround with a NULL check - campbell */
+	check_limiter_refcount("do_build_seq_recursively", se);
 
-#define SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
+	return se;
+}
 
 static TStripElem* do_build_seq_array_recursively(Scene *scene,
-	ListBase *seqbasep, int cfra, int chanshown)
+	ListBase *seqbasep, int cfra, int chanshown, int render_size)
 {
 	Sequence* seq_arr[MAXSEQ+1];
 	int count;
@@ -2231,7 +2341,7 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
 
 	
 	if(count == 1) {
-		se = do_build_seq_recursively(scene, seq_arr[0], cfra);
+		se = do_build_seq_recursively(scene, seq_arr[0], cfra, render_size);
 		if (se->ibuf) {
 			se->ibuf_comp = se->ibuf;
 			IMB_refImBuf(se->ibuf_comp);
@@ -2253,7 +2363,7 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
 			break;
 		}
 		if (seq->blend_mode == SEQ_BLEND_REPLACE) {
-			do_build_seq_recursively(scene, seq, cfra);
+			do_build_seq_recursively(scene, seq, cfra, render_size);
 			if (se->ibuf) {
 				se->ibuf_comp = se->ibuf;
 				IMB_refImBuf(se->ibuf);
@@ -2261,6 +2371,9 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
 				se->ibuf_comp = IMB_allocImBuf(
 					(short)seqrectx, (short)seqrecty, 
 					32, IB_rect, 0);
+				IMB_cache_limiter_insert(se->ibuf_comp);
+				IMB_cache_limiter_ref(se->ibuf_comp);
+				IMB_cache_limiter_touch(se->ibuf_comp);
 			}
 			break;
 		}
@@ -2285,7 +2398,7 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
 		switch (early_out) {
 		case -1:
 		case 2:
-			do_build_seq_recursively(scene, seq, cfra);
+			do_build_seq_recursively(scene, seq, cfra, render_size);
 			if (se->ibuf) {
 				se->ibuf_comp = se->ibuf;
 				IMB_refImBuf(se->ibuf_comp);
@@ -2293,6 +2406,9 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
 				se->ibuf_comp = IMB_allocImBuf(
 					(short)seqrectx, (short)seqrecty, 
 					32, IB_rect, 0);
+				IMB_cache_limiter_insert(se->ibuf_comp);
+				IMB_cache_limiter_ref(se->ibuf_comp);
+				IMB_cache_limiter_touch(se->ibuf_comp);
 			}
 			break;
 		case 1:
@@ -2306,11 +2422,14 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
 			}
 			break;
 		case 0:
-			do_build_seq_recursively(scene, seq, cfra);
+			do_build_seq_recursively(scene, seq, cfra, render_size);
 			if (!se->ibuf) {
 				se->ibuf = IMB_allocImBuf(
 					(short)seqrectx, (short)seqrecty, 
 					32, IB_rect, 0);
+				IMB_cache_limiter_insert(se->ibuf);
+				IMB_cache_limiter_ref(se->ibuf);
+				IMB_cache_limiter_touch(se->ibuf);
 			}
 			if (i == 0) {
 				se->ibuf_comp = se->ibuf;
@@ -2369,13 +2488,6 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
 				IMB_rect_from_float(se2->ibuf);
 			}
 			
-#ifdef SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
-			if (se2->ibuf->rect==NULL && se2->ibuf->rect_float==NULL) {
-				printf("ERROR: sequencer se2->ibuf missing buffer\n");
-			} else if (se1->ibuf && se1->ibuf->rect==NULL && se1->ibuf->rect_float==NULL) {
-				printf("ERROR: sequencer se1->ibuf missing buffer\n");
-			} else {
-#endif
 			/* bad hack, to fix crazy input ordering of 
 			   those two effects */
 
@@ -2397,10 +2509,6 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
 					   se2->ibuf_comp);
 			}
 			
-#ifdef SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
-			}
-#endif
-			
 			IMB_cache_limiter_insert(se2->ibuf_comp);
 			IMB_cache_limiter_ref(se2->ibuf_comp);
 			IMB_cache_limiter_touch(se2->ibuf_comp);
@@ -2428,7 +2536,7 @@ static TStripElem* do_build_seq_array_recursively(Scene *scene,
  * you have to unref after usage!
  */
 
-static ImBuf *give_ibuf_seq_impl(Scene *scene, int rectx, int recty, int cfra, int chanshown)
+static ImBuf *give_ibuf_seq_impl(Scene *scene, int rectx, int recty, int cfra, int chanshown, int render_size)
 {
 	Editing *ed= seq_give_editing(scene, FALSE);
 	int count;
@@ -2449,28 +2557,32 @@ static ImBuf *give_ibuf_seq_impl(Scene *scene, int rectx, int recty, int cfra, i
 	seqrectx= rectx;	/* bad bad global! */
 	seqrecty= recty;
 
-	se = do_build_seq_array_recursively(scene, seqbasep, cfra, chanshown);
+	se = do_build_seq_array_recursively(scene, seqbasep, cfra, chanshown, render_size);
 
 	if(!se) { 
 		return 0;
 	}
 
+	check_limiter_refcount_comp("give_ibuf_seq_impl", se);
+
 	return se->ibuf_comp;
 }
 
-ImBuf *give_ibuf_seq_direct(Scene *scene, int rectx, int recty, int cfra, Sequence *seq)
+ImBuf *give_ibuf_seq_direct(Scene *scene, int rectx, int recty, int cfra, int render_size, Sequence *seq)
 {
 	TStripElem* se;
 
 	seqrectx= rectx;	/* bad bad global! */
 	seqrecty= recty;
 
-	se = do_build_seq_recursively(scene, seq, cfra);
+	se = do_build_seq_recursively(scene, seq, cfra, render_size);
 
 	if(!se) { 
 		return 0;
 	}
 
+	check_limiter_refcount("give_ibuf_seq_direct", se);
+
 	if (se->ibuf) {
 		IMB_cache_limiter_unref(se->ibuf);
 	}
@@ -2478,9 +2590,9 @@ ImBuf *give_ibuf_seq_direct(Scene *scene, int rectx, int recty, int cfra, Sequen
 	return se->ibuf;
 }
 
-ImBuf *give_ibuf_seq(Scene *scene, int rectx, int recty, int cfra, int chanshown)
+ImBuf *give_ibuf_seq(Scene *scene, int rectx, int recty, int cfra, int chanshown, int render_size)
 {
-	ImBuf* i = give_ibuf_seq_impl(scene, rectx, recty, cfra, chanshown);
+	ImBuf* i = give_ibuf_seq_impl(scene, rectx, recty, cfra, chanshown, render_size);
 
 	if (i) {
 		IMB_cache_limiter_unref(i);
@@ -2535,6 +2647,7 @@ typedef struct PrefetchQueueElem {
 	int recty;
 	int cfra;
 	int chanshown;
+	int render_size;
 
 	int monoton_cfra;
 
@@ -2580,7 +2693,8 @@ static void *seq_prefetch_thread(void * This_)
 		
 		if (e->cfra >= s_last) { 
 			e->ibuf = give_ibuf_seq_impl(This->scene, 
-				e->rectx, e->recty, e->cfra, e->chanshown);
+				e->rectx, e->recty, e->cfra, e->chanshown,
+				e->render_size);
 		}
 
 		pthread_mutex_lock(&queue_lock);
@@ -2689,7 +2803,8 @@ void seq_stop_threads()
 	BLI_end_threads(0);
 }
 
-void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown)
+void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown,
+				int render_size)
 {
 	PrefetchQueueElem *e;
 	if (seq_thread_shutdown) {
@@ -2701,6 +2816,7 @@ void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown)
 	e->recty = recty;
 	e->cfra = cfra;
 	e->chanshown = chanshown;
+	e->render_size = render_size;
 	e->monoton_cfra = monoton_cfra++;
 
 	pthread_mutex_lock(&queue_lock);
@@ -2741,13 +2857,13 @@ void seq_wait_for_prefetch_ready()
 	fprintf(stderr, "SEQ-THREAD: prefetch done\n");
 }
 
-ImBuf *give_ibuf_seq_threaded(Scene *scene, int rectx, int recty, int cfra, int chanshown)
+ImBuf *give_ibuf_seq_threaded(Scene *scene, int rectx, int recty, int cfra, int chanshown, int render_size)
 {
 	PrefetchQueueElem *e = NULL;
 	int found_something = FALSE;
 
 	if (seq_thread_shutdown) {
-		return give_ibuf_seq(scene, rectx, recty, cfra, chanshown);
+		return give_ibuf_seq(scene, rectx, recty, cfra, chanshown, render_size);
 	}
 
 	while (!e) {
@@ -2758,7 +2874,8 @@ ImBuf *give_ibuf_seq_threaded(Scene *scene, int rectx, int recty, int cfra, int
 			if (cfra == e->cfra &&
 			    chanshown == e->chanshown &&
 			    rectx == e->rectx && 
-			    recty == e->recty) {
+			    recty == e->recty &&
+			    render_size == e->render_size) {
 				success = TRUE;
 				found_something = TRUE;
 				break;
@@ -2770,7 +2887,8 @@ ImBuf *give_ibuf_seq_threaded(Scene *scene, int rectx, int recty, int cfra, int
 				if (cfra == e->cfra &&
 				    chanshown == e->chanshown &&
 				    rectx == e->rectx && 
-				    recty == e->recty) {
+				    recty == e->recty &&
+				    render_size == e->render_size) {
 					found_something = TRUE;
 					break;
 				}
@@ -2786,7 +2904,8 @@ ImBuf *give_ibuf_seq_threaded(Scene *scene, int rectx, int recty, int cfra, int
 				    cfra == tslot->current->cfra &&
 				    chanshown == tslot->current->chanshown &&
 				    rectx == tslot->current->rectx && 
-				    recty == tslot->current->recty) {
+				    recty == tslot->current->recty &&
+				    render_size== tslot->current->render_size){
 					found_something = TRUE;
 					break;
 				}
@@ -2887,6 +3006,7 @@ void free_imbuf_seq_except(Scene *scene, int cfra)
 			if(seq->type==SEQ_MOVIE)
 				if(seq->startdisp > cfra || seq->enddisp < cfra)
 					free_anim_seq(seq);
+			free_proxy_seq(seq);
 		}
 	}
 	SEQ_END
@@ -3010,6 +3130,7 @@ void free_imbuf_seq_with_ipo(Scene *scene, struct Ipo *ipo)
 			if(seq->type == SEQ_SPEED) {
 				sequence_effect_speed_rebuild_map(seq, 1);
 			}
+			free_proxy_seq(seq);
 		}
 	}
 	SEQ_END
@@ -3021,7 +3142,7 @@ void do_render_seq(RenderResult *rr, int cfra)
 {
 	ImBuf *ibuf;
 
-	ibuf= give_ibuf_seq(scene, rr->rectx, rr->recty, cfra, 0);
+	ibuf= give_ibuf_seq(scene, rr->rectx, rr->recty, cfra, 0, scene->r.size);
 	
 	if(ibuf) {
 		if(ibuf->rect_float) {
@@ -3076,6 +3197,7 @@ void do_render_seq(RenderResult *rr, int cfra)
 					"user preferences.\n");
 				free_imbuf_seq();
 			}
+			free_proxy_seq(seq);
 		}
 	}
 	else {
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 8bf56f136bc..27357d92aae 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -547,7 +547,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Scene *scene, Object
 
 	calc.vgroup = get_named_vertexgroup_num(calc.ob, smd->vgroup_name);
 
-	if(dm != NULL)
+	if(dm != NULL && smd->shrinkType == MOD_SHRINKWRAP_PROJECT)
 	{
 		//Setup arrays to get vertexs positions, normals and deform weights
 		calc.vert   = dm->getVertDataArray(dm, CD_MVERT);
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index d7accd54fb9..bc6b487080c 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3075,8 +3075,8 @@ static void apply_spring_memory(Object *ob)
 	int a;
 	float b,l,r;
 
-    b = sb->plastic;
 	if (sb && sb->totspring){
+		b = sb->plastic;
 		for(a=0; a<sb->totspring; a++) {
 			bs  = &sb->bspring[a];
 			bp1 =&sb->bpoint[bs->v1];
@@ -3546,9 +3546,9 @@ static void springs_from_particles(Object *ob)
 	int a,k;
 	float hairmat[4][4];
 
-	psys= ob->soft->particles;
-	sb= ob->soft;	
-	if(ob && sb && psys) { 	
+	if(ob && ob->soft && ob->soft->particles) { 	
+		psys= ob->soft->particles;
+		sb= ob->soft;	
 		psmd = psys_get_modifier(ob, psys);
 
 		bp= sb->bpoint;
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index 8bad269a85e..7fe129ed6fc 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -110,6 +110,10 @@ World *add_world(char *name)
 	wrld->mode = WO_DBVT_CULLING;	// DBVT culling by default
 	wrld->occlusionRes = 128;
 	wrld->preview = NULL;
+	wrld->ticrate = 60;
+	wrld->maxlogicstep = 5;
+	wrld->physubstep = 1;
+	wrld->maxphystep = 5;
 
 	return wrld;
 }
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 472a6612a50..0277da5f908 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -242,6 +242,9 @@ static void write_video_frame(RenderData *rd, AVFrame* frame)
 #ifdef FFMPEG_CODEC_TIME_BASE
 	frame->pts = rd->cfra - rd->sfra;
 #endif
+	if (G.scene->r.mode & R_FIELDS) {
+		frame->top_field_first = ((G.scene->r.mode & R_ODDFIELD) != 0);
+	}
 
 	outsize = avcodec_encode_video(c, video_buffer, video_buffersize, 
 				       frame);