2.5

Cleanup commit:

- Yafray removed. Also did cmake/scons files, but didn't compile with it,
  so test would be appreciated :)
- Removed old crap from Windows release dir, should be checked on
  further by windows release builder later.

5 files changed, 1 insertions, 116 deletions

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 5465600d22b..8ba7dc123e7 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -29,14 +29,9 @@ FILE(GLOB SRC intern/source/*.c)
 SET(INC 
   intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
   extern/include ../blenkernel ../radiosity/extern/include ../imbuf
-  ../quicktime ../include ../../kernel/gen_messaging ../yafray ../blenloader
+  ../quicktime ../include ../../kernel/gen_messaging ../blenloader
 )
 
-IF(NOT WITH_YAFRAY)
-  ADD_DEFINITIONS(-DDISABLE_YAFRAY)
-ENDIF(NOT WITH_YAFRAY)
-
-
 IF(WITH_OPENEXR)
   ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index c3fdc632ce4..173f5db8482 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -10,11 +10,6 @@ incs += ' ../include ../blenloader'
 
 defs = []
 
-if env['WITH_BF_YAFRAY']:
-    incs += ' ../yafray'
-else:
-    defs.append('DISABLE_YAFRAY')
-
 if env['WITH_BF_QUICKTIME']:
     defs.append('WITH_QUICKTIME')
     incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile
index eb12c7637f7..22680b26338 100644
--- a/source/blender/render/intern/source/Makefile
+++ b/source/blender/render/intern/source/Makefile
@@ -45,7 +45,6 @@ CPPFLAGS += -I../../../imbuf
 CPPFLAGS += -I../../../makesdna
 CPPFLAGS += -I../../../blenkernel
 CPPFLAGS += -I../../../quicktime
-CPPFLAGS += -I../../../yafray
 CPPFLAGS += -I../../../../kernel/gen_messaging
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 # not very neat: the rest of blender..
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 4ca7244e976..6bc88f7499b 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -114,18 +114,6 @@
 #include "zbuf.h"
 #include "sunsky.h"
 
-#ifndef DISABLE_YAFRAY /* disable yafray */
-
-#include "YafRay_Api.h"
-
-/* yafray: Identity transform 'hack' removed, exporter now transforms vertices back to world.
- * Same is true for lamp coords & vec.
- * Duplicated data objects & dupliframe/duplivert objects are only stored once,
- * only the matrix is stored for all others, in yafray these objects are instances of the original.
- * The main changes are in RE_Database_FromScene().
- */
-
-#endif /* disable yafray */
 
 /* 10 times larger than normal epsilon, test it on default nurbs sphere with ray_transp (for quad detection) */
 /* or for checking vertex normal flips */
@@ -3468,22 +3456,6 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 	}
 	else lar->ray_totsamp= 0;
 	
-#ifndef DISABLE_YAFRAY
-	/* yafray: photonlight and other params */
-	if (re->r.renderer==R_YAFRAY) {
-		lar->YF_numphotons = la->YF_numphotons;
-		lar->YF_numsearch = la->YF_numsearch;
-		lar->YF_phdepth = la->YF_phdepth;
-		lar->YF_useqmc = la->YF_useqmc;
-		lar->YF_causticblur = la->YF_causticblur;
-		lar->YF_ltradius = la->YF_ltradius;
-		lar->YF_bufsize = la->YF_bufsize;
-		lar->YF_glowint = la->YF_glowint;
-		lar->YF_glowofs = la->YF_glowofs;
-		lar->YF_glowtype = la->YF_glowtype;
-	}
-#endif /* disable yafray */
-
 	lar->spotsi= la->spotsize;
 	if(lar->mode & LA_HALO) {
 		if(lar->spotsi>170.0) lar->spotsi= 170.0;
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index cc2cf290795..2d6e03f95c2 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -63,12 +63,6 @@
 #include "RE_pipeline.h"
 #include "radio.h"
 
-#ifndef DISABLE_YAFRAY
-/* yafray: include for yafray export/render */
-#include "YafRay_Api.h"
-
-#endif /* disable yafray */
-
 /* internal */
 #include "render_types.h"
 #include "renderpipeline.h"
@@ -2209,69 +2203,6 @@ static void do_render_composite_fields_blur_3d(Render *re)
 	re->display_draw(re->ddh, re->result, NULL);
 }
 
-#ifndef DISABLE_YAFRAY
-/* yafray: main yafray render/export call */
-static void yafrayRender(Render *re)
-{
-	RE_FreeRenderResult(re->result);
-	re->result= new_render_result(re, &re->disprect, 0, RR_USEMEM);
-	
-	// need this too, for aspect/ortho/etc info
-	RE_SetCamera(re, re->scene->camera);
-
-	// switch must be done before prepareScene()
-	if (!re->r.YFexportxml)
-		YAF_switchFile();
-	else
-		YAF_switchPlugin();
-	
-	printf("Starting scene conversion.\n");
-	RE_Database_FromScene(re, re->scene, 1);
-	printf("Scene conversion done.\n");
-	
-	re->i.starttime = PIL_check_seconds_timer();
-	
-	YAF_exportScene(re);
-
-	/* also needed for yafray border render, straight copy from do_render_fields_blur_3d() */
-	/* when border render, check if we have to insert it in black */
-	if(re->result) {
-		if(re->r.mode & R_BORDER) {
-			if((re->r.mode & R_CROP)==0) {
-				RenderResult *rres;
-				
-				/* sub-rect for merge call later on */
-				re->result->tilerect= re->disprect;
-				
-				/* this copying sequence could become function? */
-				re->disprect.xmin= re->disprect.ymin= 0;
-				re->disprect.xmax= re->winx;
-				re->disprect.ymax= re->winy;
-				re->rectx= re->winx;
-				re->recty= re->winy;
-				
-				rres= new_render_result(re, &re->disprect, 0, RR_USEMEM);
-				
-				merge_render_result(rres, re->result);
-				RE_FreeRenderResult(re->result);
-				re->result= rres;
-				
-				re->display_init(re->dih, re->result);
-				re->display_draw(re->ddh, re->result, NULL);
-			}
-		}
-	}
-
-	re->i.lastframetime = PIL_check_seconds_timer()- re->i.starttime;
-	re->stats_draw(re->sdh, &re->i);
-	
-	RE_Database_Free(re);
-}
-
-
-
-#endif /* disable yafray */
-
 static void renderresult_stampinfo(Scene *scene)
 {
 	RenderResult rres;
@@ -2300,14 +2231,7 @@ static void do_render_all_options(Render *re)
 		
 	}
 	else {
-#ifndef DISABLE_YAFRAY
-		if(re->r.renderer==R_YAFRAY)
-			yafrayRender(re);
-		else
-			do_render_composite_fields_blur_3d(re);
-#else
 		do_render_composite_fields_blur_3d(re);
-#endif
 	}
 	
 	/* for UI only */