[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15183] branches/soc-2008-unclezeiv/source /blender: Restoring the possibility to have single sampled point lights without QMC: this was still possible in code but disabled in UI.

[Davide Vercelli]

Revision: 15183
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15183
Author:   unclezeiv
Date:     2008-06-10 01:12:27 +0200 (Tue, 10 Jun 2008)

Log Message:
-----------
Restoring the possibility to have single sampled point lights without QMC: this was still possible in code but disabled in UI.

Please note that this is needed only in order to perform fair comparisons between the lightcuts algorithm and "vanilla" rendering code flow; it is not meant to be left in at the end of the project.

Modified Paths:
--------------
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c

Modified: branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c	2008-06-09 22:54:56 UTC (rev 15182)
+++ branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c	2008-06-09 23:12:27 UTC (rev 15183)
@@ -3566,12 +3566,18 @@
 	lar->area_sizez= la->area_sizez;
 
 	lar->area_shape= la->area_shape;
-	
+
+/* 
+ * XXX: LIGHTCUTS: check disabled to perform fair comparison; should be restored in the end
+ * see also buttons_shading.c:lamp_panel_spot() (circa line 2680)
+ */
+#if 0
 	/* Annoying, lamp UI does this, but the UI might not have been used? - add here too.
 	 * make sure this matches buttons_shading.c's logic */
 	if(ELEM4(la->type, LA_AREA, LA_SPOT, LA_SUN, LA_LOCAL) && (la->mode & LA_SHAD_RAY))
 		if (ELEM3(la->type, LA_SPOT, LA_SUN, LA_LOCAL))
 			if (la->ray_samp_method == LA_SAMP_CONSTANT) la->ray_samp_method = LA_SAMP_HALTON;
+#endif
 	
 	lar->ray_samp_method= la->ray_samp_method;
 	lar->ray_samp_type= la->ray_samp_type;

Modified: branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c
===================================================================
--- branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c	2008-06-09 22:54:56 UTC (rev 15182)
+++ branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c	2008-06-09 23:12:27 UTC (rev 15183)
@@ -2673,9 +2673,14 @@
 	if(ELEM4(la->type, LA_AREA, LA_SPOT, LA_SUN, LA_LOCAL) && (la->mode & LA_SHAD_RAY)) {
 		
 		if (ELEM3(la->type, LA_SPOT, LA_SUN, LA_LOCAL)) {
-			if (la->ray_samp_method == LA_SAMP_CONSTANT) la->ray_samp_method = LA_SAMP_HALTON;
+			/* 
+			 * XXX: LIGHTCUTS: check disabled to perform fair comparison; should be restored in the end
+			 * also re-added "Constant" in menu
+			 * see also convertblender.c:add_render_lamp() (circa line 3570)
+			 */
+			/* if (la->ray_samp_method == LA_SAMP_CONSTANT) la->ray_samp_method = LA_SAMP_HALTON; */
 		
-			uiDefButS(block, MENU, B_REDR, "Adaptive QMC %x1|Constant QMC %x2",
+			uiDefButS(block, MENU, B_REDR, "Constant %x0|Adaptive QMC %x1|Constant QMC %x2",
 				100,110,200,19, &la->ray_samp_method, 0, 0, 0, 0, "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower");
 		
 			uiDefButF(block, NUM,B_LAMPREDRAW,"Soft Size",	100,80,200,19, &la->area_size, 0.01, 100.0, 10, 0, "Area light size, doesn't affect energy amount");