[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13672] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 13672
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13672
Author:   blendix
Date:     2008-02-13 15:29:06 +0100 (Wed, 13 Feb 2008)

Log Message:
-----------

- Fix for bug #8264: SSS turned off by "default" render settings button,
  I also added a button to control enabling/disabling SSS for render.
- Fix for potential halo sorting crash.
- Add a newline at the end of a file to remove gcc warning.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c
    trunk/blender/source/blender/src/buttons_scene.c
    trunk/blender/source/blender/src/meshtools.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2008-02-13 13:55:22 UTC (rev 13671)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2008-02-13 14:29:06 UTC (rev 13672)
@@ -2047,7 +2047,8 @@
 
 static int verghalo(const void *a1, const void *a2)
 {
-	const HaloRen *har1= a1, *har2= a2;
+	const HaloRen *har1= *(const HaloRen**)a1;
+	const HaloRen *har2= *(const HaloRen**)a2;
 	
 	if(har1->zs < har2->zs) return 1;
 	else if(har1->zs > har2->zs) return -1;

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c	2008-02-13 13:55:22 UTC (rev 13671)
+++ trunk/blender/source/blender/src/buttons_scene.c	2008-02-13 14:29:06 UTC (rev 13672)
@@ -1574,7 +1574,7 @@
 		G.scene->r.xasp= 54;
 		G.scene->r.yasp= 51;
 		G.scene->r.size= 100;
-		G.scene->r.mode= R_OSA+R_SHADOW+R_FIELDS;
+		G.scene->r.mode= R_OSA+R_SHADOW+R_FIELDS+R_SSS;
 		G.scene->r.imtype= R_TARGA;
 		G.scene->r.xparts=  G.scene->r.yparts= 4;
 
@@ -2174,11 +2174,12 @@
 		uiDefButS(block, MENU, B_DIFF,"Octree resolution %t|64 %x64|128 %x128|256 %x256|512 %x512",	496,13,64,20,&G.scene->r.ocres,0.0,0.0, 0, 0, "Octree resolution for ray tracing");
 
 	uiBlockBeginAlign(block);
-	uiDefButBitI(block, TOG, R_SHADOW, B_REDR,"Shadow",	565,172,60,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable shadow calculation");
-	uiDefButBitI(block, TOG, R_ENVMAP, B_REDR,"EnvMap",	627,172,60,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable environment map rendering");
-	uiDefButBitI(block, TOG, R_PANORAMA, B_REDR,"Pano",	565,142,40,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable panorama rendering (output width is multiplied by Xparts)");
-	uiDefButBitI(block, TOG, R_RAYTRACE, B_REDR,"Ray",606,142,40,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable ray tracing");
-	uiDefButBitI(block, TOG, R_RADIO, B_REDR,"Radio",	647,142,40,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable radiosity rendering");
+	uiDefButBitI(block, TOG, R_SHADOW, B_REDR,"Shadow",	565,172,52,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable shadow calculation");
+	uiDefButBitI(block, TOG, R_SSS, B_REDR,"SSS",	617,172,32,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable subsurface scattering map rendering");
+	uiDefButBitI(block, TOG, R_PANORAMA, B_REDR,"Pano",	649,172,38,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable panorama rendering (output width is multiplied by Xparts)");
+	uiDefButBitI(block, TOG, R_ENVMAP, B_REDR,"EnvMap",	565,142,52,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable environment map rendering");
+	uiDefButBitI(block, TOG, R_RAYTRACE, B_REDR,"Ray",617,142,32,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable ray tracing");
+	uiDefButBitI(block, TOG, R_RADIO, B_REDR,"Radio",	649,142,38,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable radiosity rendering");
 	uiBlockEndAlign(block);
 	
 	uiBlockBeginAlign(block);

Modified: trunk/blender/source/blender/src/meshtools.c
===================================================================
--- trunk/blender/source/blender/src/meshtools.c	2008-02-13 13:55:22 UTC (rev 13671)
+++ trunk/blender/source/blender/src/meshtools.c	2008-02-13 14:29:06 UTC (rev 13672)
@@ -1137,4 +1137,5 @@
 	objects_bake_render(event, &error_msg);
 	if (error_msg)
 		error(error_msg);
-}
\ No newline at end of file
+}
+