Revision: 15038
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15038
Author: unclezeiv
Date: 2008-05-29 02:42:22 +0200 (Thu, 29 May 2008)
Log Message:
-----------
Removed the "Lights" UI slider which is currently unused, misleading and prone
to cause crashes when testers fiddled with it. It will be restored in due time.
Also removed debug print of tree structure.
Modified Paths:
--------------
branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
Modified:
branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
===================================================================
--- branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
2008-05-29 00:27:09 UTC (rev 15037)
+++ branches/soc-2008-unclezeiv/source/blender/render/intern/source/lightcuts.c
2008-05-29 00:42:22 UTC (rev 15038)
@@ -286,7 +286,7 @@
lcd->root_local = cluster_id;
printf("Lightcuts tree built: %d\n", lcd->root_local);
- debug_print_tree(lcd->array_local, lcd->root_local, 0);
+ /* debug_print_tree(lcd->array_local, lcd->root_local, 0); */
MEM_freeN(pair_array);
}
@@ -425,7 +425,8 @@
#endif
}
- lcd->max_lights= re->r.lightcuts_max_lights;
+ /* XXX: whis should be equal to re->r.lightcuts_max_lights when light
generation is in place */
+ lcd->max_lights= lcd->light_counter;
lcd->error_rate= re->r.lightcuts_max_error;
lcd->max_cut= re->r.lightcuts_max_cut;
Modified: branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
===================================================================
--- branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
2008-05-29 00:27:09 UTC (rev 15037)
+++ branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
2008-05-29 00:42:22 UTC (rev 15038)
@@ -3421,7 +3421,7 @@
uiDefButBitI(block, TOG, R_LIGHTCUTS, B_REDR, "Enable lightcuts", 692,
142, 192, 20, &G.scene->r.mode, 0, 0, 0, 0, "Enable lightcuts rendering");
uiDefButF(block, NUM, B_REDR, "Max error:", 692, 120, 192, 20,
&G.scene->r.lightcuts_max_error, 0.001, 1.0, 0, 0, "The maximum allowed error
rate");
- uiDefButI(block, NUM, B_REDR, "Lights:", 692, 98, 192, 20,
&G.scene->r.lightcuts_max_lights, 0, 100000, 0, 0, "The maximum number of
lights to generate");
+ /* uiDefButI(block, NUM, B_REDR, "Lights:", 692, 98, 192, 20,
&G.scene->r.lightcuts_max_lights, 0, 100000, 0, 0, "The maximum number of
lights to generate"); */
uiDefButI(block, NUM, B_REDR, "Max cut:", 692, 76, 192, 20,
&G.scene->r.lightcuts_max_cut, 0, 5000, 0, 0, "The maximum size of the cut");
uiDefButBitI(block, TOG, SCE_PASS_LCFAUX, B_SET_PASS, "False color",
692, 54, 192, 20, &srl->passflag, 0, 0, 0, 0, "Deliver false color pass");
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
