[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20199] trunk/blender/source/blender: Bugfix, sorta :)

[Ton Roosendaal]

Revision: 20199
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20199
Author:   ton
Date:     2009-05-14 14:36:07 +0200 (Thu, 14 May 2009)

Log Message:
-----------
Bugfix, sorta :)

Removed option to choose rendering to yafray. New yafaray is better, and
already is being linked as option on the blender.org download page.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/src/buttons_scene.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2009-05-14 12:16:28 UTC (rev 20198)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2009-05-14 12:36:07 UTC (rev 20199)
@@ -8092,6 +8092,14 @@
 			wrld->occlusionRes = 128;
 		}
 	}
+		
+	if (main->versionfile < 249) {
+		Scene *sce;
+		for (sce= main->scene.first; sce; sce= sce->id.next)
+			sce->r.renderer= 0;
+		
+	}
+	
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c	2009-05-14 12:16:28 UTC (rev 20198)
+++ trunk/blender/source/blender/src/buttons_scene.c	2009-05-14 12:36:07 UTC (rev 20199)
@@ -2277,15 +2277,7 @@
 	if(uiNewPanel(curarea, block, "Render", "Render", 320, 0, 318, 204)==0) return;
 
 	uiBlockBeginAlign(block);
-	uiDefBut(block, BUT,B_DORENDER,"RENDER",	369, 164, 191,37, 0, 0, 0, 0, 0, "Render the current frame (F12)");
-#ifndef DISABLE_YAFRAY
-	/* yafray: on request, render engine menu is back again, and moved to Render panel */
-	uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0|YafRay %x1", 
-												369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine");	
-#else
-	uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0", 
-												369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine");	
-#endif /* disable yafray */
+	uiDefBut(block, BUT,B_DORENDER,"RENDER",	369, 142, 191,59, 0, 0, 0, 0, 0, "Render the current frame (F12)");
 
 	uiBlockBeginAlign(block);
 	if((G.scene->r.scemode & R_FULL_SAMPLE) && (G.scene->r.scemode & R_EXR_TILE_FILE))