Yafray 'should' now work again. A bit more testing needed.

But seems to work sofar anyway, composit nodes should work as well.

7 files changed, 197 insertions, 268 deletions

diff --git a/source/blender/yafray/YafRay_Api.h b/source/blender/yafray/YafRay_Api.h
index f5ab4817448..8c47a79837f 100644
--- a/source/blender/yafray/YafRay_Api.h
+++ b/source/blender/yafray/YafRay_Api.h
@@ -5,12 +5,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-void YAF_switchPlugin();
-void YAF_switchFile();
-int YAF_exportScene();
-//void YAF_displayImage();
-void YAF_addDupliMtx(Object* obj);
-int YAF_objectKnownData(Object* obj);
+	void YAF_switchPlugin();
+	void YAF_switchFile();
+	int YAF_exportScene(Render* re);
+	void YAF_addDupliMtx(Object* obj);
+	int YAF_objectKnownData(Object* obj);
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/yafray/intern/api.cpp b/source/blender/yafray/intern/api.cpp
index 154743e76be..f59c5e1f73e 100755
--- a/source/blender/yafray/intern/api.cpp
+++ b/source/blender/yafray/intern/api.cpp
@@ -4,15 +4,13 @@
 static yafrayFileRender_t byfile;
 static yafrayPluginRender_t byplugin;
 
-yafrayRender_t *YAFBLEND=&byplugin;
+yafrayRender_t *YAFBLEND = &byplugin;
 
-extern "C" 
+extern "C"
 {
-void YAF_switchPlugin() {YAFBLEND=&byplugin;}
-void YAF_switchFile() {YAFBLEND=&byfile;}
-int YAF_exportScene() { return (int)YAFBLEND->exportScene(); }
-//void YAF_displayImage() { YAFBLEND->displayImage(); }
-void YAF_addDupliMtx(Object* obj) { YAFBLEND->addDupliMtx(obj); }
-int YAF_objectKnownData(Object* obj) { return (int)YAFBLEND->objectKnownData(obj); }
-
+	void YAF_switchPlugin() { YAFBLEND = &byplugin; }
+	void YAF_switchFile() { YAFBLEND = &byfile; }
+	int YAF_exportScene(Render* re) { return (int)YAFBLEND->exportScene(re); }
+	void YAF_addDupliMtx(Object* obj) { YAFBLEND->addDupliMtx(obj); }
+	int YAF_objectKnownData(Object* obj) { return (int)YAFBLEND->objectKnownData(obj); }
 }
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp
index dfd89eca722..10b61a6cc1b 100755
--- a/source/blender/yafray/intern/export_File.cpp
+++ b/source/blender/yafray/intern/export_File.cpp
@@ -206,29 +206,29 @@ bool yafrayFileRender_t::writeRender()
 	// finally export render block
 	ostr.str("");
 	ostr << "<render camera_name=\"MAINCAM\"\n";
-	ostr << "\traydepth=\"" << R.r.YF_raydepth << "\" gamma=\"" << R.r.YF_gamma << "\" exposure=\"" << R.r.YF_exposure << "\"\n";
+	ostr << "\traydepth=\"" << re->r.YF_raydepth << "\" gamma=\"" << re->r.YF_gamma << "\" exposure=\"" << re->r.YF_exposure << "\"\n";
 
-	if(R.r.YF_AA) {
-		ostr << "\tAA_passes=\"" << R.r.YF_AApasses << "\" AA_minsamples=\"" << R.r.YF_AAsamples << "\"\n";
-		ostr << "\tAA_pixelwidth=\"" << R.r.YF_AApixelsize << "\" AA_threshold=\"" << R.r.YF_AAthreshold << "\"\n";
+	if(re->r.YF_AA) {
+		ostr << "\tAA_passes=\"" << re->r.YF_AApasses << "\" AA_minsamples=\"" << re->r.YF_AAsamples << "\"\n";
+		ostr << "\tAA_pixelwidth=\"" << re->r.YF_AApixelsize << "\" AA_threshold=\"" << re->r.YF_AAthreshold << "\"\n";
 	}
 	else {
 		// removed the default AA settings for midquality GI, better leave it to user
-		if ((R.r.mode & R_OSA) && (R.r.osa)) {
-			int passes=(R.r.osa%4)==0 ? R.r.osa/4 : 1;
-			int minsamples=(R.r.osa%4)==0 ? 4 : R.r.osa;
+		if ((re->r.mode & R_OSA) && (re->r.osa)) {
+			int passes = (re->r.osa & 3)==0 ? (re->r.osa >> 2) : 1;
+			int minsamples=(re->r.osa & 3)==0 ? 4 : re->r.osa;
 			ostr << "\tAA_passes=\"" << passes << "\" AA_minsamples=\"" << minsamples << "\"\n";
 		}
 		else ostr << "\tAA_passes=\"0\" AA_minsamples=\"1\"\n";
-		ostr << "\tAA_pixelwidth=\"1.5\" AA_threshold=\"0.05\" bias=\"" << R.r.YF_raybias
-				 << "\" clamp_rgb=\"" << ((R.r.YF_clamprgb==0) ? "on" : "off") << "\"\n";
+		ostr << "\tAA_pixelwidth=\"1.5\" AA_threshold=\"0.05\" bias=\"" << re->r.YF_raybias
+				 << "\" clamp_rgb=\"" << ((re->r.YF_clamprgb==0) ? "on" : "off") << "\"\n";
 	}
 
 	World *world = G.scene->world;
 	if (world) ostr << "\tbackground_name=\"world_background\"\n";
  
 	// alpha channel render when RGBA button enabled
-	if (R.r.planes==R_PLANES32) ostr << "\n\tsave_alpha=\"on\"";
+	if (re->r.planes==R_PLANES32) ostr << "\n\tsave_alpha=\"on\"";
 	ostr << " >\n";
 
 	// basic fog
@@ -279,7 +279,7 @@ void yafrayFileRender_t::displayImage()
 	unsigned short width = (unsigned short)(header[12] + (header[13]<<8));
 	unsigned short height = (unsigned short)(header[14] + (header[15]<<8));
 	// don't do anything if resolution doesn't match that of rectot
-	if ((width!=R.rectx) || (height!=R.recty)) {
+	if ((width!=re->rectx) || (height!=re->recty)) {
 		fclose(fp);
 		fp = NULL;
 		return;
@@ -291,22 +291,23 @@ void yafrayFileRender_t::displayImage()
 
 	/* XXX how to get the image from Blender and write to it. This call doesn't allow to change buffer rects */
 	RenderResult rres;
-	RE_GetResultImage(&R, &rres);
+	RE_GetResultImage(re, &rres);
 	// rres.rectx, rres.recty is width/height
 	// rres.rectf is float buffer, scanlines starting in bottom
 	// rres.rectz is zbuffer, available when associated pass is set
 	
 	// read data directly into buffer, picture is upside down
+	const float btf = 1.f/255.f;
 	for (unsigned short y=0;y<height;y++) {
-		unsigned char* bpt = NULL; //(unsigned char*)R.rectot + ((((height-1)-y)*width)<<2);
+		float* bpt = (float*)rres.rectf + ((((height-1)-y)*width)<<2);
 		for (unsigned short x=0;x<width;x++) {
-			bpt[2] = (unsigned char)fgetc(fp);
-			bpt[1] = (unsigned char)fgetc(fp);
-			bpt[0] = (unsigned char)fgetc(fp);
+			bpt[2] = ((float)fgetc(fp) * btf);
+			bpt[1] = ((float)fgetc(fp) * btf);
+			bpt[0] = ((float)fgetc(fp) * btf);
 			if (byte_per_pix==4)
-				bpt[3] = (unsigned char)fgetc(fp);
+				bpt[3] = ((float)fgetc(fp) * btf);
 			else
-				bpt[3] = 255;
+				bpt[3] = 1.f;
 			bpt += 4;
 		}
 	}
@@ -687,7 +688,7 @@ void yafrayFileRender_t::writeShader(const string &shader_name, Material* matr,
 	ostr << "\t\t<specular_amount value=\"" << matr->spec << "\" />\n";
 	ostr << "\t\t<alpha value=\"" << matr->alpha << "\" />\n";
 	// if no GI used, the GIpower parameter is not always initialized, so in that case ignore it
-	float bg_mult = (R.r.GImethod==0) ? 1 : R.r.GIpower;
+	float bg_mult = (re->r.GImethod==0) ? 1 : re->r.GIpower;
 	ostr << "\t\t<emit value=\"" << (matr->emit * bg_mult) << "\" />\n";
 
 	// reflection/refraction
@@ -1253,7 +1254,7 @@ void yafrayFileRender_t::writeObject(Object* obj, const vector<VlakRen*> &VLR_li
 	// for deformed objects, object->imat is no longer valid,
 	// so have to create inverse render matrix ourselves here
 	float mat[4][4], imat[4][4];
-	MTC_Mat4MulMat4(mat, obj->obmat, R.viewmat);
+	MTC_Mat4MulMat4(mat, obj->obmat, re->viewmat);
 	MTC_Mat4Invert(imat, mat);
 
 	for (vector<VlakRen*>::const_iterator fci=VLR_list.begin();
@@ -1504,7 +1505,7 @@ void yafrayFileRender_t::writeAreaLamp(LampRen* lamp, int num, float iview[4][4]
 	ostr.str("");
 	string md = "off";
 	// if no GI used, the GIphotons flag can still be set, so only use when 'full' selected
-	if ((R.r.GImethod==2) && (R.r.GIphotons)) { md="on";  power*=R.r.GIpower; }
+	if ((re->r.GImethod==2) && (re->r.GIphotons)) { md="on";  power*=re->r.GIpower; }
 	ostr << "<light type=\"arealight\" name=\"LAMP" << num+1 << "\" dummy=\""<< md << "\" power=\"" << power << "\" ";
 	// samples not used for GI with photons, can still be exported, is ignored
 	int psm=0, sm = lamp->ray_totsamp;
@@ -1539,12 +1540,12 @@ void yafrayFileRender_t::writeLamps()
 	
 	// inverse viewmatrix needed for back2world transform
 	float iview[4][4];
-	// R.viewinv != inv.R.viewmat because of possible ortho mode (see convertBlenderScene.c)
+	// re->viewinv != inv.re->viewmat because of possible ortho mode (see convertBlenderScene.c)
 	// have to invert it here
-	MTC_Mat4Invert(iview, R.viewmat);
+	MTC_Mat4Invert(iview, re->viewmat);
 	
 	// all lamps
-	for(go=(GroupObject *)R.lights.first; go; go= go->next, i++) {
+	for(go=(GroupObject *)re->lights.first; go; go= go->next, i++) {
 		LampRen* lamp = (LampRen *)go->lampren;
 
 		ostr.str("");
@@ -1601,7 +1602,7 @@ void yafrayFileRender_t::writeLamps()
 			// 'dummy' mode for spherelight when used with gpm
 			string md = "off";
 			// if no GI used, the GIphotons flag can still be set, so only use when 'full' selected
-			if ((R.r.GImethod==2) && (R.r.GIphotons)) { md="on";  pwr*=R.r.GIpower; }
+			if ((re->r.GImethod==2) && (re->r.GIphotons)) { md="on";  pwr*=re->r.GIpower; }
 			ostr << "\" power=\"" <<  pwr << "\" dummy=\"" << md << "\"";
 		}
 		else ostr << "\" power=\"" << pwr << "\"";
@@ -1613,7 +1614,7 @@ void yafrayFileRender_t::writeLamps()
 			// Also blender hemilights exported as sunlights which might have shadow flag set
 			// should have cast_shadows set to off (reported by varuag)
 			if (lamp->type!=LA_HEMI) {
-				if (R.r.mode & R_SHADOW)
+				if (re->r.mode & R_SHADOW)
 					if (((lamp->type==LA_SPOT) && (lamp->mode & LA_SHAD)) || (lamp->mode & LA_SHAD_RAY)) lpmode="on";
 			}
 			ostr << " cast_shadows=\"" << lpmode << "\"";
@@ -1703,24 +1704,24 @@ void yafrayFileRender_t::writeCamera()
 	// here Global used again
 	ostr.str("");
 	ostr << "<camera name=\"MAINCAM\" ";
-	if (R.r.mode & R_ORTHO)
+	if (re->r.mode & R_ORTHO)
 		ostr << "type=\"ortho\"";
 	else	
 		ostr << "type=\"perspective\"";
 
 	// render resolution including the percentage buttons (aleady calculated in initrender for R renderdata)
-	ostr << " resx=\"" << R.r.xsch << "\" resy=\"" << R.r.ysch << "\"";
+	ostr << " resx=\"" << re->r.xsch << "\" resy=\"" << re->r.ysch << "\"";
 
 	float f_aspect = 1;
-	if ((R.r.xsch*R.r.xasp)<=(R.r.ysch*R.r.yasp)) f_aspect = float(R.r.xsch*R.r.xasp)/float(R.r.ysch*R.r.yasp);
+	if ((re->r.xsch*re->r.xasp)<=(re->r.ysch*re->r.yasp)) f_aspect = float(re->r.xsch*re->r.xasp)/float(re->r.ysch*re->r.yasp);
 	ostr << "\n\tfocal=\"" << mainCamLens/(f_aspect*32.f);
-	ostr << "\" aspect_ratio=\"" << R.ycor << "\"";
+	ostr << "\" aspect_ratio=\"" << re->ycor << "\"";
 
 	// dof params, only valid for real camera
 	float fdist = 1;	// only changes for ortho
 	if (maincam_obj->type==OB_CAMERA) {
 		Camera* cam = (Camera*)maincam_obj->data;
-		if (R.r.mode & R_ORTHO) fdist = cam->ortho_scale*(mainCamLens/32.f);
+		if (re->r.mode & R_ORTHO) fdist = cam->ortho_scale*(mainCamLens/32.f);
 		ostr << "\n\tdof_distance=\"" << cam->YF_dofdist << "\"";
 		ostr << " aperture=\"" << cam->YF_aperture << "\"";
 		string st = "on";
@@ -1757,12 +1758,12 @@ void yafrayFileRender_t::writeCamera()
 	ostr << "\t<from x=\"" << maincam_obj->obmat[3][0] << "\""
 							<< " y=\"" << maincam_obj->obmat[3][1] << "\""
 							<< " z=\"" << maincam_obj->obmat[3][2] << "\" />\n";
-	ostr << "\t<to x=\"" << maincam_obj->obmat[3][0] - fdist * R.viewmat[0][2]
-					<< "\" y=\"" << maincam_obj->obmat[3][1] - fdist * R.viewmat[1][2]
-					<< "\" z=\"" << maincam_obj->obmat[3][2] - fdist * R.viewmat[2][2] << "\" />\n";
-	ostr << "\t<up x=\"" << maincam_obj->obmat[3][0] + R.viewmat[0][1]
-					<< "\" y=\"" << maincam_obj->obmat[3][1] + R.viewmat[1][1]
-					<< "\" z=\"" << maincam_obj->obmat[3][2] + R.viewmat[2][1] << "\" />\n";
+	ostr << "\t<to x=\"" << maincam_obj->obmat[3][0] - fdist * re->viewmat[0][2]
+					<< "\" y=\"" << maincam_obj->obmat[3][1] - fdist * re->viewmat[1][2]
+					<< "\" z=\"" << maincam_obj->obmat[3][2] - fdist * re->viewmat[2][2] << "\" />\n";
+	ostr << "\t<up x=\"" << maincam_obj->obmat[3][0] + re->viewmat[0][1]
+					<< "\" y=\"" << maincam_obj->obmat[3][1] + re->viewmat[1][1]
+					<< "\" z=\"" << maincam_obj->obmat[3][2] + re->viewmat[2][1] << "\" />\n";
 	xmlfile << ostr.str();
 
 	xmlfile << "</camera>\n\n";
@@ -1772,7 +1773,7 @@ void yafrayFileRender_t::writeHemilight()
 {
 	World *world = G.scene->world;
 	bool fromAO = false;
-	if (R.r.GIquality==6){
+	if (re->r.GIquality==6){
 		// use Blender AO params is possible
 		if (world==NULL) return;
 		if ((world->mode & WO_AMB_OCC)==0) {
@@ -1782,18 +1783,18 @@ void yafrayFileRender_t::writeHemilight()
 		else fromAO = true;
 	}
 	ostr.str("");
-	if (R.r.GIcache) {
-		ostr << "<light type=\"pathlight\" name=\"path_LT\" power=\"" << R.r.GIpower << "\" mode=\"occlusion\"";
-		ostr << "\n\tcache=\"on\" use_QMC=\"on\" threshold=\"" << R.r.GIrefinement << "\" "
-				 << "cache_size=\"" << ((2.0/float(R.r.xsch))*R.r.GIpixelspersample) << "\"";
-		ostr << "\n\tshadow_threshold=\"" << (1.0-R.r.GIshadowquality) << "\" grid=\"82\" search=\"35\"";
-		ostr << "\n\tignore_bumpnormals=\"" << (R.r.YF_nobump ? "on" : "off") << "\"";
+	if (re->r.GIcache) {
+		ostr << "<light type=\"pathlight\" name=\"path_LT\" power=\"" << re->r.GIpower << "\" mode=\"occlusion\"";
+		ostr << "\n\tcache=\"on\" use_QMC=\"on\" threshold=\"" << re->r.GIrefinement << "\" "
+				 << "cache_size=\"" << ((2.0/float(re->r.xsch))*re->r.GIpixelspersample) << "\"";
+		ostr << "\n\tshadow_threshold=\"" << (1.0-re->r.GIshadowquality) << "\" grid=\"82\" search=\"35\"";
+		ostr << "\n\tignore_bumpnormals=\"" << (re->r.YF_nobump ? "on" : "off") << "\"";
 		if (fromAO) {
 			// for AO, with cache, using range of 32*1 to 32*16 seems good enough
 			ostr << "\n\tsamples=\"" << 32*world->aosamp << "\" maxdistance=\"" << world->aodist << "\" >\n";
 		}
 		else {
-			switch (R.r.GIquality)
+			switch (re->r.GIquality)
 			{
 				case 1 : ostr << " samples=\"128\" >\n";  break;
 				case 2 : ostr << " samples=\"256\" >\n";  break;
@@ -1805,7 +1806,7 @@ void yafrayFileRender_t::writeHemilight()
 		}
 	}
 	else {
-		ostr << "<light type=\"hemilight\" name=\"hemi_LT\" power=\"" << R.r.GIpower << "\"";
+		ostr << "<light type=\"hemilight\" name=\"hemi_LT\" power=\"" << re->r.GIpower << "\"";
 		if (fromAO) {
 			// use minimum of 4 samples for lowest sample setting, single sample way too noisy
 			ostr << "\n\tsamples=\"" << 3 + world->aosamp*world->aosamp
@@ -1813,7 +1814,7 @@ void yafrayFileRender_t::writeHemilight()
 					 << "\" use_QMC=\"" << ((world->aomode & WO_AORNDSMP) ? "off" : "on") << "\" >\n";
 		}
 		else {
-			switch (R.r.GIquality)
+			switch (re->r.GIquality)
 			{
 				case 1 :
 				case 2 : ostr << " samples=\"16\" >\n";  break;
@@ -1831,19 +1832,19 @@ void yafrayFileRender_t::writeHemilight()
 void yafrayFileRender_t::writePathlight()
 {
 	ostr.str("");
-	if (R.r.GIphotons)
+	if (re->r.GIphotons)
 	{
-		ostr << "<light type=\"globalphotonlight\" name=\"gpm\" photons=\"" << R.r.GIphotoncount << "\"" << endl;
-		ostr << "\tradius=\"" << R.r.GIphotonradius << "\" depth=\"" << ((R.r.GIdepth>2) ? (R.r.GIdepth-1) : 1)
-				 << "\" caus_depth=\"" << R.r.GIcausdepth << "\" search=\"" << R.r.GImixphotons << "\" >"<<endl;
+		ostr << "<light type=\"globalphotonlight\" name=\"gpm\" photons=\"" << re->r.GIphotoncount << "\"" << endl;
+		ostr << "\tradius=\"" << re->r.GIphotonradius << "\" depth=\"" << ((re->r.GIdepth>2) ? (re->r.GIdepth-1) : 1)
+				 << "\" caus_depth=\"" << re->r.GIcausdepth << "\" search=\"" << re->r.GImixphotons << "\" >"<<endl;
 		ostr << "</light>"<<endl;
 	}
-	ostr << "<light type=\"pathlight\" name=\"path_LT\" power=\"" << R.r.GIindirpower << "\"";
-	ostr << " depth=\"" << ((R.r.GIphotons) ? 1 : R.r.GIdepth) << "\" caus_depth=\"" << R.r.GIcausdepth <<"\"\n";
-	if (R.r.GIdirect && R.r.GIphotons) ostr << "direct=\"on\"" << endl;
-	if (R.r.GIcache && !(R.r.GIdirect && R.r.GIphotons))
+	ostr << "<light type=\"pathlight\" name=\"path_LT\" power=\"" << re->r.GIindirpower << "\"";
+	ostr << " depth=\"" << ((re->r.GIphotons) ? 1 : re->r.GIdepth) << "\" caus_depth=\"" << re->r.GIcausdepth <<"\"\n";
+	if (re->r.GIdirect && re->r.GIphotons) ostr << "direct=\"on\"" << endl;
+	if (re->r.GIcache && !(re->r.GIdirect && re->r.GIphotons))
 	{
-		switch (R.r.GIquality)
+		switch (re->r.GIquality)
 		{
 			case 1 : ostr << " samples=\"128\" \n";   break;
 			case 2 : ostr << " samples=\"256\" \n";   break;
@@ -1852,15 +1853,15 @@ void yafrayFileRender_t::writePathlight()
 			case 5 : ostr << " samples=\"2048\" \n";  break;
 			default: ostr << " samples=\"512\" \n";
 		}
-		ostr << " cache=\"on\" use_QMC=\"on\" threshold=\"" << R.r.GIrefinement << "\"" << endl;
-		ostr << "\tignore_bumpnormals=\"" << (R.r.YF_nobump ? "on" : "off") << "\"\n";
-		float sbase = 2.0/float(R.r.xsch);
-		ostr << "\tcache_size=\"" << sbase*R.r.GIpixelspersample << "\" shadow_threshold=\"" <<
-			1.0-R.r.GIshadowquality << "\" grid=\"82\" search=\"35\" >\n";
+		ostr << " cache=\"on\" use_QMC=\"on\" threshold=\"" << re->r.GIrefinement << "\"" << endl;
+		ostr << "\tignore_bumpnormals=\"" << (re->r.YF_nobump ? "on" : "off") << "\"\n";
+		float sbase = 2.0/float(re->r.xsch);
+		ostr << "\tcache_size=\"" << sbase*re->r.GIpixelspersample << "\" shadow_threshold=\"" <<
+			1.0-re->r.GIshadowquality << "\" grid=\"82\" search=\"35\" >\n";
 	}
 	else
 	{
-		switch (R.r.GIquality)
+		switch (re->r.GIquality)
 		{
 			case 1 : ostr << " samples=\"16\" >\n";   break;
 			case 2 : ostr << " samples=\"36\" >\n";   break;
@@ -1877,12 +1878,12 @@ void yafrayFileRender_t::writePathlight()
 bool yafrayFileRender_t::writeWorld()
 {
 	World *world = G.scene->world;
-	if (R.r.GIquality!=0) {
-		if (R.r.GImethod==1) {
+	if (re->r.GIquality!=0) {
+		if (re->r.GImethod==1) {
 			if (world==NULL) cout << "WARNING: need world background for skydome!\n";
 			writeHemilight();
 		}
-		else if (R.r.GImethod==2) writePathlight();
+		else if (re->r.GImethod==2) writePathlight();
 	}
 
 	if (world==NULL) return false;
@@ -1918,7 +1919,7 @@ bool yafrayFileRender_t::writeWorld()
 	ostr << "<background type=\"constant\" name=\"world_background\" >\n";
 	// if no GI used, the GIpower parameter is not always initialized, so in that case ignore it
 	// (have to change method to init yafray vars in Blender)
-	float bg_mult = (R.r.GImethod==0) ? 1 : R.r.GIpower;
+	float bg_mult = (re->r.GImethod==0) ? 1 : re->r.GIpower;
 	ostr << "\t<color r=\"" << (world->horr * bg_mult) << 
 								"\" g=\"" << (world->horg * bg_mult) << 
 								"\" b=\"" << (world->horb * bg_mult) << "\" />\n";
@@ -1931,7 +1932,7 @@ bool yafrayFileRender_t::writeWorld()
 bool yafrayFileRender_t::executeYafray(const string &xmlpath)
 {
 	char yfr[8];
-	sprintf(yfr, "%d ", R.r.YF_numprocs);
+	sprintf(yfr, "%d ", re->r.YF_numprocs);
 	string command = command_path + "yafray -c " + yfr + "\"" + xmlpath + "\"";
 #ifndef WIN32
 	sigset_t yaf,old;
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index ab3c38cc795..f04b7062c6c 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -183,24 +183,12 @@ bool yafrayPluginRender_t::initExport()
 			cerr << "Error loading yafray plugin: " << PIL_dynlib_get_error_as_string(handle) << endl;
 			return false;
 		}
-		yafrayGate = constructor(R.r.YF_numprocs, YafrayPluginPath());
+		yafrayGate = constructor(re->r.YF_numprocs, YafrayPluginPath());
 		
 		cout << "YafRay plugin loaded" << endl;
 		plugin_loaded = true;
 	}
 	
-	// all buffers allocated in initrender.c
-//	unsigned int *bpt=R.rectot, count=R.rectx*R.recty;
-//	while (--count) bpt[count] = 0xff800000;
-//	cout << "Image initialized" << endl;
-
-//	int *zbuf=R.rectz;
-//	count = R.rectx*R.recty;
-//	while (--count) zbuf[count] = 0x7fffffff;
-//	cout << "Zbuffer initialized" << endl;
-
-	// no need to fill ftot
-	
 	return true;
 }
 
@@ -208,23 +196,23 @@ bool yafrayPluginRender_t::writeRender()
 {
 	yafray::paramMap_t params;
 	params["camera_name"]=yafray::parameter_t("MAINCAM");
-	params["raydepth"]=yafray::parameter_t((float)R.r.YF_raydepth);
-	params["gamma"]=yafray::parameter_t(R.r.YF_gamma);
-	params["exposure"]=yafray::parameter_t(R.r.YF_exposure);
-	if (R.r.YF_AA)
+	params["raydepth"]=yafray::parameter_t((float)re->r.YF_raydepth);
+	params["gamma"]=yafray::parameter_t(re->r.YF_gamma);
+	params["exposure"]=yafray::parameter_t(re->r.YF_exposure);
+	if (re->r.YF_AA)
 	{
-		params["AA_passes"] = yafray::parameter_t((int)R.r.YF_AApasses);
-		params["AA_minsamples"] = yafray::parameter_t(R.r.YF_AAsamples);
-		params["AA_pixelwidth"] = yafray::parameter_t(R.r.YF_AApixelsize);
-		params["AA_threshold"] = yafray::parameter_t(R.r.YF_AAthreshold);
+		params["AA_passes"] = yafray::parameter_t((int)re->r.YF_AApasses);
+		params["AA_minsamples"] = yafray::parameter_t(re->r.YF_AAsamples);
+		params["AA_pixelwidth"] = yafray::parameter_t(re->r.YF_AApixelsize);
+		params["AA_threshold"] = yafray::parameter_t(re->r.YF_AAthreshold);
 	}
 	else
 	{
 		// removed the default AA settings for midquality GI, better leave it to user
-		if ((R.r.mode & R_OSA) && (R.r.osa)) 
+		if ((re->r.mode & R_OSA) && (re->r.osa)) 
 		{
-			params["AA_passes"] = yafray::parameter_t((R.r.osa%4)==0 ? R.r.osa/4 : 1);
-			params["AA_minsamples"] = yafray::parameter_t((R.r.osa%4)==0 ? 4 : R.r.osa);
+			params["AA_passes"] = yafray::parameter_t((re->r.osa & 3)==0 ? (re->r.osa >> 2) : 1);
+			params["AA_minsamples"] = yafray::parameter_t((re->r.osa & 3)==0 ? 4 : re->r.osa);
 		}
 		else 
 		{
@@ -234,12 +222,12 @@ bool yafrayPluginRender_t::writeRender()
 		params["AA_pixelwidth"] = yafray::parameter_t(1.5);
 		params["AA_threshold"] = yafray::parameter_t(0.05f);
 	}
-	if(R.r.mode & R_BORDER) 
+	if (re->r.mode & R_BORDER) 
 	{
-		params["border_xmin"] = yafray::parameter_t( R.r.border.xmin*2.0-1.0 );
-		params["border_xmax"] = yafray::parameter_t( R.r.border.xmax*2.0-1.0 );
-		params["border_ymin"] = yafray::parameter_t( R.r.border.ymin*2.0-1.0 );
-		params["border_ymax"] = yafray::parameter_t( R.r.border.ymax*2.0-1.0 );
+		params["border_xmin"] = yafray::parameter_t( re->r.border.xmin*2.0-1.0 );
+		params["border_xmax"] = yafray::parameter_t( re->r.border.xmax*2.0-1.0 );
+		params["border_ymin"] = yafray::parameter_t( re->r.border.ymin*2.0-1.0 );
+		params["border_ymax"] = yafray::parameter_t( re->r.border.ymax*2.0-1.0 );
 	}
 	if (hasworld) {
 		World *world = G.scene->world;
@@ -252,71 +240,22 @@ bool yafrayPluginRender_t::writeRender()
 		}
 		params["background_name"] = yafray::parameter_t("world_background");
 	}
-	params["bias"]=yafray::parameter_t(R.r.YF_raybias);
-	params["clamp_rgb"] = yafray::parameter_t((R.r.YF_clamprgb==0) ? "on" : "off");
-	blenderYafrayOutput_t output;
-	yafrayGate->render(params,output);
-	cout<<"render finished"<<endl;
+	params["bias"] = yafray::parameter_t(re->r.YF_raybias);
+	params["clamp_rgb"] = yafray::parameter_t((re->r.YF_clamprgb==0) ? "on" : "off");
+	blenderYafrayOutput_t output(re);
+	yafrayGate->render(params, output);
+	cout << "render finished" << endl;
 	yafrayGate->clear();
 	return true;
 }
 
 bool yafrayPluginRender_t::finishExport()
 {
-	//displayImage();
 	return true;
 }
 
-// displays the image rendered with xml export
-// Now loads rendered image into blender renderbuf.
-void yafrayPluginRender_t::displayImage()
-{
-	// although it is possible to load the image using blender,
-	// maybe it is best to just do a read here, for now the yafray output is always a raw tga anyway
-
-
-	FILE* fp = fopen(imgout.c_str(), "rb");
-	if (fp==NULL) {
-		cout << "YAF_displayImage(): Could not open image file\n";
-		return;
-	}
-
-	unsigned char header[18];
-	fread(&header, 1, 18, fp);
-	unsigned short width = (unsigned short)(header[12] + (header[13]<<8));
-	unsigned short height = (unsigned short)(header[14] + (header[15]<<8));
-	unsigned char byte_per_pix = (unsigned char)(header[16]>>3);
-	// read past any id (none in this case though)
-	unsigned int idlen = (unsigned int)header[0];
-	if (idlen) fseek(fp, idlen, SEEK_CUR);
-
-	/* XXX how to get the image from Blender and write to it. This call doesn't allow to change buffer rects */
-	RenderResult rres;
-	RE_GetResultImage(&R, &rres);
-	// rres.rectx, rres.recty is width/height
-	// rres.rectf is float buffer, scanlines starting in bottom
-	// rres.rectz is zbuffer, available when associated pass is set
-	
-	
-	// read data directly into buffer, picture is upside down
-	for (unsigned short y=0;y<height;y++) {
-		unsigned char* bpt = NULL;//(unsigned char*)R.rectot + ((((height-1)-y)*width)<<2);
-		for (unsigned short x=0;x<width;x++) {
-			bpt[2] = (unsigned char)fgetc(fp);
-			bpt[1] = (unsigned char)fgetc(fp);
-			bpt[0] = (unsigned char)fgetc(fp);
-			if (byte_per_pix==4)
-				bpt[3] = (unsigned char)fgetc(fp);
-			else
-				bpt[3] = 255;
-			bpt += 4;
-		}
-	}
-
-	fclose(fp);
-	fp = NULL;
-}
 
+// displayImage() not for plugin, see putPixel() below
 
 #ifdef WIN32
 #define MAXPATHLEN MAX_PATH
@@ -673,7 +612,7 @@ void yafrayPluginRender_t::writeShader(const string &shader_name, Material* matr
 	params["alpha"] = yafray::parameter_t(matr->alpha);
 	
 	// if no GI used, the GIpower parameter is not always initialized, so in that case ignore it
-	float bg_mult = (R.r.GImethod==0) ? 1 : R.r.GIpower;
+	float bg_mult = (re->r.GImethod==0) ? 1 : re->r.GIpower;
 	params["emit"]=yafray::parameter_t(matr->emit*bg_mult);
 
 	// reflection/refraction
@@ -1275,7 +1214,7 @@ void yafrayPluginRender_t::genVertices(vector<yafray::point3d_t> &verts, int &vi
 	// for deformed objects, object->imat is no longer valid,
 	// so have to create inverse render matrix ourselves here
 	float mat[4][4], imat[4][4];
-	MTC_Mat4MulMat4(mat, obj->obmat, R.viewmat);
+	MTC_Mat4MulMat4(mat, obj->obmat, re->viewmat);
 	MTC_Mat4Invert(imat, mat);
 
 	if (vert_idx.find(vlr->v1)==vert_idx.end()) 
@@ -1468,7 +1407,7 @@ void yafrayPluginRender_t::writeAreaLamp(LampRen* lamp, int num, float iview[4][
 	
 	string md = "off";
 	// if no GI used, the GIphotons flag can still be set, so only use when 'full' selected
-	if ((R.r.GImethod==2) && (R.r.GIphotons)) { md="on";  power*=R.r.GIpower; }
+	if ((re->r.GImethod==2) && (re->r.GIphotons)) { md="on";  power*=re->r.GIpower; }
 	params["type"]=yafray::parameter_t("arealight");
 	char temp[16];
 	sprintf(temp,"LAMP%d",num+1);
@@ -1507,12 +1446,12 @@ void yafrayPluginRender_t::writeLamps()
 	
 	// inver viewmatrix needed for back2world transform
 	float iview[4][4];
-	// R.viewinv != inv.R.viewmat because of possible ortho mode (see convertBlenderScene.c)
+	// re->viewinv != inv.re->viewmat because of possible ortho mode (see convertBlenderScene.c)
 	// have to invert it here
-	MTC_Mat4Invert(iview, R.viewmat);
+	MTC_Mat4Invert(iview, re->viewmat);
 
 	// all lamps
-	for(go=(GroupObject *)R.lights.first; go; go= go->next, i++)
+	for(go=(GroupObject *)re->lights.first; go; go= go->next, i++)
 	{
 		LampRen* lamp = (LampRen *)go->lampren;
 		
@@ -1574,7 +1513,7 @@ void yafrayPluginRender_t::writeLamps()
 			// 'dummy' mode for spherelight when used with gpm
 			string md = "off";
 			// if no GI used, the GIphotons flag can still be set, so only use when 'full' selected
-			if ((R.r.GImethod==2) && (R.r.GIphotons)) { md="on";  pwr*=R.r.GIpower; }
+			if ((re->r.GImethod==2) && (re->r.GIphotons)) { md="on";  pwr*=re->r.GIpower; }
 			params["power"] = yafray::parameter_t(pwr);
 			params["dummy"] = yafray::parameter_t(md);
 		}
@@ -1587,7 +1526,7 @@ void yafrayPluginRender_t::writeLamps()
 			// Also blender hemilights exported as sunlights which might have shadow flag set
 			// should have cast_shadows set to off (reported by varuag)
 			if (lamp->type!=LA_HEMI) {
-				if (R.r.mode & R_SHADOW)
+				if (re->r.mode & R_SHADOW)
 					if (((lamp->type==LA_SPOT) && (lamp->mode & LA_SHAD)) || (lamp->mode & LA_SHAD_RAY)) lpmode="on";
 			}
 			params["cast_shadows"] = yafray::parameter_t(lpmode);
@@ -1677,23 +1616,23 @@ void yafrayPluginRender_t::writeCamera()
 {
 	yafray::paramMap_t params;
 	params["name"]=yafray::parameter_t("MAINCAM");
-	if (R.r.mode & R_ORTHO)
+	if (re->r.mode & R_ORTHO)
 		params["type"] = yafray::parameter_t("ortho");
 	else
 		params["type"] = yafray::parameter_t("perspective");
-	params["resx"]=yafray::parameter_t(R.r.xsch);
-	params["resy"]=yafray::parameter_t(R.r.ysch);
+	params["resx"]=yafray::parameter_t(re->r.xsch);
+	params["resy"]=yafray::parameter_t(re->r.ysch);
 
 	float f_aspect = 1;
-	if ((R.r.xsch*R.r.xasp)<=(R.r.ysch*R.r.yasp)) f_aspect = float(R.r.xsch*R.r.xasp)/float(R.r.ysch*R.r.yasp);
+	if ((re->r.xsch*re->r.xasp)<=(re->r.ysch*re->r.yasp)) f_aspect = float(re->r.xsch*re->r.xasp)/float(re->r.ysch*re->r.yasp);
 	params["focal"] = yafray::parameter_t(mainCamLens/(f_aspect*32.f));
-	params["aspect_ratio"] = yafray::parameter_t(R.ycor);
+	params["aspect_ratio"] = yafray::parameter_t(re->ycor);
 
 	// dof params, only valid for real camera
 	float fdist = 1;	// only changes for ortho
 	if (maincam_obj->type==OB_CAMERA) {
 		Camera* cam = (Camera*)maincam_obj->data;
-		if (R.r.mode & R_ORTHO) fdist = cam->ortho_scale*(mainCamLens/32.f);
+		if (re->r.mode & R_ORTHO) fdist = cam->ortho_scale*(mainCamLens/32.f);
 		params["dof_distance"] = yafray::parameter_t(cam->YF_dofdist);
 		params["aperture"] = yafray::parameter_t(cam->YF_aperture);
 		if (cam->flag & CAM_YF_NO_QMC)
@@ -1727,13 +1666,13 @@ void yafrayPluginRender_t::writeCamera()
 	params["from"]=yafray::parameter_t(
 			yafray::point3d_t(maincam_obj->obmat[3][0], maincam_obj->obmat[3][1], maincam_obj->obmat[3][2]));
 	params["to"]=yafray::parameter_t(
-			yafray::point3d_t(maincam_obj->obmat[3][0] - fdist * R.viewmat[0][2],
-												maincam_obj->obmat[3][1] - fdist * R.viewmat[1][2],
-												maincam_obj->obmat[3][2] - fdist * R.viewmat[2][2]));
+			yafray::point3d_t(maincam_obj->obmat[3][0] - fdist * re->viewmat[0][2],
+												maincam_obj->obmat[3][1] - fdist * re->viewmat[1][2],
+												maincam_obj->obmat[3][2] - fdist * re->viewmat[2][2]));
 	params["up"]=yafray::parameter_t(
-			yafray::point3d_t(maincam_obj->obmat[3][0] + R.viewmat[0][1],
-												maincam_obj->obmat[3][1] + R.viewmat[1][1],
-												maincam_obj->obmat[3][2] + R.viewmat[2][1]));
+			yafray::point3d_t(maincam_obj->obmat[3][0] + re->viewmat[0][1],
+												maincam_obj->obmat[3][1] + re->viewmat[1][1],
+												maincam_obj->obmat[3][2] + re->viewmat[2][1]));
 
 	yafrayGate->addCamera(params);
 }
@@ -1743,7 +1682,7 @@ void yafrayPluginRender_t::writeHemilight()
 	yafray::paramMap_t params;
 	World *world = G.scene->world;
 	bool fromAO = false;
-	if (R.r.GIquality==6){
+	if (re->r.GIquality==6){
 		// use Blender AO params is possible
 		if (world==NULL) return;
 		if ((world->mode & WO_AMB_OCC)==0) {
@@ -1752,19 +1691,19 @@ void yafrayPluginRender_t::writeHemilight()
 		}
 		else fromAO = true;
 	}
-	if (R.r.GIcache) {
+	if (re->r.GIcache) {
 		params["type"] = yafray::parameter_t("pathlight");
 		params["name"] = yafray::parameter_t("path_LT");
-		params["power"] = yafray::parameter_t(R.r.GIpower);
+		params["power"] = yafray::parameter_t(re->r.GIpower);
 		params["mode"] = yafray::parameter_t("occlusion");
-		params["ignore_bumpnormals"] = yafray::parameter_t(R.r.YF_nobump ? "on" : "off");
+		params["ignore_bumpnormals"] = yafray::parameter_t(re->r.YF_nobump ? "on" : "off");
 		if (fromAO) {
 			// for AO, with cache, using range of 32*1 to 32*16 seems good enough
 			params["samples"] = yafray::parameter_t(32*world->aosamp);
 			params["maxdistance"] = yafray::parameter_t(world->aodist);
 		}
 		else {
-			switch (R.r.GIquality)
+			switch (re->r.GIquality)
 			{
 				case 1 : params["samples"] = yafray::parameter_t(128);  break;
 				case 2 : params["samples"] = yafray::parameter_t(256);  break;
@@ -1776,16 +1715,16 @@ void yafrayPluginRender_t::writeHemilight()
 		}
 		params["cache"] = yafray::parameter_t("on");
 		params["use_QMC"] = yafray::parameter_t("on");
-		params["threshold"] = yafray::parameter_t(R.r.GIrefinement);
-		params["cache_size"] = yafray::parameter_t((2.0/float(R.r.xsch))*R.r.GIpixelspersample);
-		params["shadow_threshold"] = yafray::parameter_t(1.0 - R.r.GIshadowquality);
+		params["threshold"] = yafray::parameter_t(re->r.GIrefinement);
+		params["cache_size"] = yafray::parameter_t((2.0/float(re->r.xsch))*re->r.GIpixelspersample);
+		params["shadow_threshold"] = yafray::parameter_t(1.0 - re->r.GIshadowquality);
 		params["grid"] = yafray::parameter_t(82);
 		params["search"] = yafray::parameter_t(35);
 	}
 	else {
 		params["type"] = yafray::parameter_t("hemilight");
 		params["name"] = yafray::parameter_t("hemi_LT");
-		params["power"] = yafray::parameter_t(R.r.GIpower);
+		params["power"] = yafray::parameter_t(re->r.GIpower);
 		if (fromAO) {
 			// use minimum of 4 samples for lowest sample setting, single sample way too noisy
 			params["samples"] = yafray::parameter_t(3 + world->aosamp*world->aosamp);
@@ -1793,7 +1732,7 @@ void yafrayPluginRender_t::writeHemilight()
 			params["use_QMC"] = yafray::parameter_t((world->aomode & WO_AORNDSMP) ? "off" : "on");
 		}
 		else {
-			switch (R.r.GIquality)
+			switch (re->r.GIquality)
 			{
 				case 1 :
 				case 2 : params["samples"]=yafray::parameter_t(16);  break;
@@ -1809,28 +1748,28 @@ void yafrayPluginRender_t::writeHemilight()
 
 void yafrayPluginRender_t::writePathlight()
 {
-	if (R.r.GIphotons)
+	if (re->r.GIphotons)
 	{
 		yafray::paramMap_t params;
 		params["type"] = yafray::parameter_t("globalphotonlight");
 		params["name"] = yafray::parameter_t("gpm");
-		params["photons"] = yafray::parameter_t(R.r.GIphotoncount);
-		params["radius"] = yafray::parameter_t(R.r.GIphotonradius);
-		params["depth"] = yafray::parameter_t(((R.r.GIdepth>2) ? (R.r.GIdepth-1) : 1));
-		params["caus_depth"] = yafray::parameter_t(R.r.GIcausdepth);
-		params["search"] = yafray::parameter_t(R.r.GImixphotons);
+		params["photons"] = yafray::parameter_t(re->r.GIphotoncount);
+		params["radius"] = yafray::parameter_t(re->r.GIphotonradius);
+		params["depth"] = yafray::parameter_t(((re->r.GIdepth>2) ? (re->r.GIdepth-1) : 1));
+		params["caus_depth"] = yafray::parameter_t(re->r.GIcausdepth);
+		params["search"] = yafray::parameter_t(re->r.GImixphotons);
 		yafrayGate->addLight(params);
 	}
 	yafray::paramMap_t params;
 	params["type"] = yafray::parameter_t("pathlight");
 	params["name"] = yafray::parameter_t("path_LT");
-	params["power"] = yafray::parameter_t(R.r.GIindirpower);
-	params["depth"] = yafray::parameter_t(((R.r.GIphotons) ? 1 : R.r.GIdepth));
-	params["caus_depth"] = yafray::parameter_t(R.r.GIcausdepth);
-	if (R.r.GIdirect && R.r.GIphotons) params["direct"] = yafray::parameter_t("on");
-	if (R.r.GIcache && !(R.r.GIdirect && R.r.GIphotons))
+	params["power"] = yafray::parameter_t(re->r.GIindirpower);
+	params["depth"] = yafray::parameter_t(((re->r.GIphotons) ? 1 : re->r.GIdepth));
+	params["caus_depth"] = yafray::parameter_t(re->r.GIcausdepth);
+	if (re->r.GIdirect && re->r.GIphotons) params["direct"] = yafray::parameter_t("on");
+	if (re->r.GIcache && !(re->r.GIdirect && re->r.GIphotons))
 	{
-		switch (R.r.GIquality)
+		switch (re->r.GIquality)
 		{
 			case 1 : params["samples"] = yafray::parameter_t(128);  break;
 			case 2 : params["samples"] = yafray::parameter_t(256);  break;
@@ -1841,16 +1780,16 @@ void yafrayPluginRender_t::writePathlight()
 		}
 		params["cache"] = yafray::parameter_t("on");
 		params["use_QMC"] = yafray::parameter_t("on");
-		params["threshold"] = yafray::parameter_t(R.r.GIrefinement);
-		params["cache_size"] = yafray::parameter_t((2.0/float(R.r.xsch))*R.r.GIpixelspersample);
-		params["shadow_threshold"] = yafray::parameter_t(1.0 - R.r.GIshadowquality);
+		params["threshold"] = yafray::parameter_t(re->r.GIrefinement);
+		params["cache_size"] = yafray::parameter_t((2.0/float(re->r.xsch))*re->r.GIpixelspersample);
+		params["shadow_threshold"] = yafray::parameter_t(1.0 - re->r.GIshadowquality);
 		params["grid"] = yafray::parameter_t(82);
 		params["search"] = yafray::parameter_t(35);
-		params["ignore_bumpnormals"] = yafray::parameter_t(R.r.YF_nobump ? "on" : "off");
+		params["ignore_bumpnormals"] = yafray::parameter_t(re->r.YF_nobump ? "on" : "off");
 	}
 	else
 	{
-		switch (R.r.GIquality)
+		switch (re->r.GIquality)
 		{
 			case 1 : params["samples"] = yafray::parameter_t(16);  break;
 			case 2 : params["samples"] = yafray::parameter_t(36);  break;
@@ -1866,12 +1805,12 @@ void yafrayPluginRender_t::writePathlight()
 bool yafrayPluginRender_t::writeWorld()
 {
 	World *world = G.scene->world;
-	if (R.r.GIquality!=0) {
-		if (R.r.GImethod==1) {
+	if (re->r.GIquality!=0) {
+		if (re->r.GImethod==1) {
 			if (world==NULL) cout << "WARNING: need world background for skydome!\n";
 			writeHemilight();
 		}
-		else if (R.r.GImethod==2) writePathlight();
+		else if (re->r.GImethod==2) writePathlight();
 	}
 	if (world==NULL) return false;
 	
@@ -1907,7 +1846,7 @@ bool yafrayPluginRender_t::writeWorld()
 	params["name"] = yafray::parameter_t("world_background");
 	// if no GI used, the GIpower parameter is not always initialized, so in that case ignore it
 	// (have to change method to init yafray vars in Blender)
-	float bg_mult = (R.r.GImethod==0) ? 1 : R.r.GIpower;
+	float bg_mult = (re->r.GImethod==0) ? 1 : re->r.GIpower;
 	params["color"]=yafray::parameter_t(yafray::color_t(world->horr * bg_mult,
 																											world->horg * bg_mult,
 																											world->horb * bg_mult));
@@ -1915,50 +1854,41 @@ bool yafrayPluginRender_t::writeWorld()
 	return true;
 }
 
-bool blenderYafrayOutput_t::putPixel(int x, int y, const yafray::color_t &c, 
+// display_draw() needs render layer info
+extern "C" {
+#include "renderpipeline.h"
+}
+bool blenderYafrayOutput_t::putPixel(int x, int y, const yafray::color_t &c,
 		yafray::CFLOAT alpha, yafray::PFLOAT depth)
 {
-	unsigned int px = ((R.recty-1)-y)*R.rectx;
-	unsigned char* bpt = NULL; //(unsigned char*)R.rectot + (px<<2);
-	int x4 = x<<2;
-	int temp = (int)(c.R*255.f+0.5f);
-	if (temp>255) temp=255;
-	bpt[x4] = temp;
-	temp=(int)(c.G*255.f+0.5f);
-	if (temp>255) temp=255;
-	bpt[x4+1] = temp;
-	temp=(int)(c.B*255.f+0.5f);
-	if (temp>255) temp=255;
-	bpt[x4+2] = temp;
-	temp=(int)(alpha*255.f+0.5f);
-	if (temp>255) temp=255;
-	bpt[x4+3] = temp;
-
-	// float buffer
-//	if ((R.r.mode & R_FBUF) && R.rectftot) {
-//		float* fpt = R.rectftot + (px<<2);
-//		fpt[x4] = c.R;
-//		fpt[x4+1] = c.G;
-//		fpt[x4+2] = c.B;
-//		fpt[x4+3] = alpha;
-//	}
+	/* XXX how to get the image from Blender and write to it. This call doesn't allow to change buffer rects */
+	RenderResult rres;
+	RE_GetResultImage(re, &rres);
+	// rres.rectx, rres.recty is width/height
+	// rres.rectf is float buffer, scanlines starting in bottom
+	// rres.rectz is zbuffer, available when associated pass is set
+
+	const unsigned int yy = (rres.recty - 1) - y;
+	const unsigned int px = yy * rres.rectx;
+
+	// rgba
+	float* fpt = rres.rectf + ((px + x) << 2);
+	*fpt++ = c.R;
+	*fpt++ = c.G;
+	*fpt++ = c.B;
+	*fpt = alpha;
 
 	// depth values
-//	int* zbuf = R.rectz + px;
-//	depth -= R.clipsta;
-//	float mz = R.clipend - R.clipsta;
-//	if (depth<0) depth=0; else if (depth>mz) depth=mz;
-//	if (mz!=0.f) mz = 2147483647.f/mz;
-//	zbuf[x] = (int)(depth*mz);
-
-	out++;
-	if (out==4096)
-	{
+	float* zbuf = rres.rectz + px;
+	if (zbuf) zbuf[x] = depth;
+
+	out = (out+1) & 4095;
+	if (out==0) {
+		re->result->renlay = render_get_active_layer(re, re->result);
 		/* XXX second arg is rcti *rect, allows to indicate sub-rect in image to draw */
-		R.display_draw(R.result, NULL);
-		out = 0;
+		re->display_draw(re->result, NULL);
 	}
 
-	if (R.test_break()) return false;
+	if (re->test_break()) return false;
 	return true;
 }
diff --git a/source/blender/yafray/intern/export_Plugin.h b/source/blender/yafray/intern/export_Plugin.h
index 2ec79ba1625..14b24599e81 100644
--- a/source/blender/yafray/intern/export_Plugin.h
+++ b/source/blender/yafray/intern/export_Plugin.h
@@ -65,12 +65,13 @@ class yafrayPluginRender_t : public yafrayRender_t
 class blenderYafrayOutput_t : public yafray::colorOutput_t
 {
 	public:
-		blenderYafrayOutput_t() {out=0;};
-		virtual ~blenderYafrayOutput_t() {};
-		virtual bool putPixel(int x, int y,const yafray::color_t &c, 
-				yafray::CFLOAT alpha=0,yafray::PFLOAT depth=0);
-		virtual void flush() {};
+		blenderYafrayOutput_t(Render* re):out(0) { this->re = re; }
+		virtual ~blenderYafrayOutput_t() {}
+		virtual bool putPixel(int x, int y, const yafray::color_t &c,
+				yafray::CFLOAT alpha=0, yafray::PFLOAT depth=0);
+		virtual void flush() {}
 	protected:
+		Render* re;
 		int out;
 };
 
diff --git a/source/blender/yafray/intern/yafray_Render.cpp b/source/blender/yafray/intern/yafray_Render.cpp
index c6a588110c3..b91f572dd2c 100644
--- a/source/blender/yafray/intern/yafray_Render.cpp
+++ b/source/blender/yafray/intern/yafray_Render.cpp
@@ -22,8 +22,9 @@ void yafrayRender_t::clearAll()
 	imgtex_shader.clear();
 }
 
-bool yafrayRender_t::exportScene()
+bool yafrayRender_t::exportScene(Render* re)
 {
+	this->re = re;
 
   // get camera first, no checking should be necessary, all done by Blender
 	maincam_obj = G.scene->camera;
@@ -85,9 +86,9 @@ bool yafrayRender_t::getAllMatTexObs()
 	// but on the other hand that could also hide the real problem of course...
 	map<string, Object*> renderobs;
 
-	for (int i=0;i<R.totvlak;i++) {
+	for (int i=0; i < re->totvlak; i++) {
 
-		if ((i & 255)==0) vlr=R.blovl[i>>8]; else vlr++;
+		if ((i & 255)==0) vlr = re->blovl[i>>8]; else vlr++;
 
 		// ---- The materials & textures
 		// in this case, probably every face has a material assigned, which can be the default material,
diff --git a/source/blender/yafray/intern/yafray_Render.h b/source/blender/yafray/intern/yafray_Render.h
index a50954d2ed4..31369ff7475 100644
--- a/source/blender/yafray/intern/yafray_Render.h
+++ b/source/blender/yafray/intern/yafray_Render.h
@@ -25,8 +25,7 @@ extern "C" {
 #include "BKE_image.h"
 
 #include "render_types.h"
-extern struct Render R;		/* only to get it compile for now */
-	
+
 /* useful matrix & vector operations */
 #include "MTC_matrixops.h"
 #include "MTC_vectorops.h"
@@ -60,11 +59,12 @@ class yafrayRender_t
 		virtual ~yafrayRender_t() {}
 
 		// mtds
-		bool exportScene();
+		bool exportScene(Render* re);
 		void addDupliMtx(Object* obj);
 		bool objectKnownData(Object* obj);
 
 	protected:
+		Render* re;
 		Object* maincam_obj;
 		float mainCamLens;
 
@@ -95,9 +95,8 @@ class yafrayRender_t
 		virtual bool writeRender()=0;
 		virtual bool initExport()=0;
 		virtual bool finishExport()=0;
-		
-		void clearAll();
 
+		void clearAll();
 };
 
 #endif