[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45638] trunk/blender/source/blender/ render: Blender Internal:

[Thomas Dinges]

Revision: 45638
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45638
Author:   dingto
Date:     2012-04-14 21:48:34 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Blender Internal:
* Remove some remaining (already commented) radiosity cruft. 

Modified Paths:
--------------
    trunk/blender/source/blender/render/SConscript
    trunk/blender/source/blender/render/extern/include/RE_render_ext.h
    trunk/blender/source/blender/render/intern/source/convertblender.c
    trunk/blender/source/blender/render/intern/source/shadeoutput.c

Modified: trunk/blender/source/blender/render/SConscript
===================================================================
--- trunk/blender/source/blender/render/SConscript	2012-04-14 21:26:50 UTC (rev 45637)
+++ trunk/blender/source/blender/render/SConscript	2012-04-14 21:48:34 UTC (rev 45638)
@@ -5,7 +5,7 @@
 raysources = env.Glob('intern/raytrace/*.cpp')
 
 incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna'
-incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf ../blenfont'
+incs += ' extern/include ../blenkernel ../imbuf ../blenfont'
 incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace ../bmesh'
 
 cflags_raytrace = env['CCFLAGS']

Modified: trunk/blender/source/blender/render/extern/include/RE_render_ext.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_render_ext.h	2012-04-14 21:26:50 UTC (rev 45637)
+++ trunk/blender/source/blender/render/extern/include/RE_render_ext.h	2012-04-14 21:48:34 UTC (rev 45638)
@@ -50,9 +50,6 @@
 struct ImBuf;
 struct DerivedMesh;
 
-// RADIO REMOVED, Maybe this will be useful later
-//void    RE_zbufferall_radio(struct RadView *vw, struct RNode **rg_elem, int rg_totelem, struct Render *re);
-
 /* particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */
 int	externtex(struct MTex *mtex, const float vec[3], float *tin, float *tr, float *tg, float *tb, float *ta, const int thread);
 

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2012-04-14 21:26:50 UTC (rev 45637)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2012-04-14 21:48:34 UTC (rev 45638)
@@ -4675,9 +4675,7 @@
 
 	/* free orco */
 	free_mesh_orco_hash(re);
-#if 0	/* radio can be redone better */
-	end_radio_render();
-#endif
+
 	end_render_materials(re->main);
 	end_render_textures(re);
 	

Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c	2012-04-14 21:26:50 UTC (rev 45637)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c	2012-04-14 21:48:34 UTC (rev 45638)
@@ -1854,7 +1854,7 @@
 	}
 	shr->alpha= shi->alpha;
 	
-	/* from now stuff everything in shr->combined: ambient, AO, radio, ramps, exposure */
+	/* from now stuff everything in shr->combined: ambient, AO, ramps, exposure */
 	if (!(ma->sss_flag & MA_DIFF_SSS) || !sss_pass_done(&R, ma)) {
 		if (R.r.mode & R_SHADOW) {
 			/* add AO in combined? */