--- blender/source/blender/src/buttons_scene.c.yafray	2006-06-25 12:08:26.000000000 +0200
+++ blender/source/blender/src/buttons_scene.c	2006-07-09 12:35:47.000000000 +0200
@@ -1644,8 +1644,11 @@
 	// label to force a boundbox for buttons not to be centered
 	uiDefBut(block, LABEL, 0, " ", 305,180,10,10, 0, 0, 0, 0, 0, "");
 
+	/* disable "xml" button in yafray rendering */
+	/* 
 	uiDefButBitS(block, TOGN, 1, B_REDR, "xml", 5,180,75,20, &G.scene->r.YFexportxml,
 					0, 0, 0, 0, "Export to an xml file and call yafray instead of plugin");
+	*/
 
 	uiDefButF(block, NUMSLI, B_DIFF,"Bi ", 5,35,150,20,	&(G.scene->r.YF_raybias), 
 				0.0, 10.0 ,0,0, "Shadow ray bias to avoid self shadowing");
--- blender/source/blender/render/intern/source/pipeline.c.yafray	2006-07-09 12:38:18.000000000 +0200
+++ blender/source/blender/render/intern/source/pipeline.c	2006-07-09 12:38:18.000000000 +0200
@@ -1681,6 +1681,9 @@
 	// need this too, for aspect/ortho/etc info
 	RE_SetCamera(re, re->scene->camera);
 
+	/* Force Yafray plugin instead of call trough XML */
+        re->r.YFexportxml=1;
+
 	// switch must be done before prepareScene()
 	if (!re->r.YFexportxml)
 		YAF_switchFile();