Revision: 22283
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22283
Author: campbellbarton
Date: 2009-08-07 01:19:05 +0200 (Fri, 07 Aug 2009)
Log Message:
-----------
- fix for a crash in readfile.c, thanks Roelf for finding.
- add media option for povray
- remove unintentional line from modifier script
Modified Paths:
--------------
branches/blender2.5/blender/release/io/engine_render_pov.py
branches/blender2.5/blender/release/ui/buttons_data_modifier.py
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
Modified: branches/blender2.5/blender/release/io/engine_render_pov.py
===================================================================
--- branches/blender2.5/blender/release/io/engine_render_pov.py 2009-08-06
22:28:55 UTC (rev 22282)
+++ branches/blender2.5/blender/release/io/engine_render_pov.py 2009-08-06
23:19:05 UTC (rev 22283)
@@ -442,6 +442,7 @@
file.write("\t\terror_bound %.4g\n" %
scene.pov_radio_error_bound)
file.write("\t\tgray_threshold %.4g\n" %
scene.pov_radio_gray_threshold)
file.write("\t\tlow_error_factor %.4g\n" %
scene.pov_radio_low_error_factor)
+ file.write("\t\tmedia %d\n" % scene.pov_radio_media)
file.write("\t\tminimum_reuse %.4g\n" %
scene.pov_radio_minimum_reuse)
file.write("\t\tnearest_count %d\n" %
scene.pov_radio_nearest_count)
file.write("\t\tnormal %d\n" % scene.pov_radio_normal)
@@ -449,10 +450,8 @@
file.write('\t}\n')
file.write('}\n')
-
-
-
+
exportCamera()
#exportMaterials()
sel = scene.objects
@@ -699,6 +698,7 @@
col.itemR(scene, "pov_radio_gray_threshold")
col.itemR(scene, "pov_radio_low_error_factor")
col.itemR(scene, "pov_radio_minimum_reuse")
+ col.itemR(scene, "pov_radio_media")
col.itemR(scene, "pov_radio_nearest_count")
col.itemR(scene, "pov_radio_normal")
col.itemR(scene, "pov_radio_always_sample")
@@ -759,6 +759,11 @@
# max_sample - not available yet
+BoolProperty( attr="pov_radio_media",
+ name="Use Media",
+ description="Radiosity estimation can be
affected by media.",
+ default= False)
+
FloatProperty( attr="pov_radio_minimum_reuse",
name="Minimum Reuse",
description="Fraction of the screen width which
sets the minimum radius of reuse for each sample point (At values higher than
2% expect errors).",
Modified: branches/blender2.5/blender/release/ui/buttons_data_modifier.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_modifier.py
2009-08-06 22:28:55 UTC (rev 22282)
+++ branches/blender2.5/blender/release/ui/buttons_data_modifier.py
2009-08-06 23:19:05 UTC (rev 22283)
@@ -17,8 +17,6 @@
row = layout.row()
row.item_menu_enumO("object.modifier_add", "type")
row.itemL()
-
- class_dict = self.__class__.__dict__
for md in ob.modifiers:
box = layout.template_modifier(md)
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2009-08-06 22:28:55 UTC (rev 22282)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2009-08-06 23:19:05 UTC (rev 22283)
@@ -9205,7 +9205,7 @@
/* move to cameras */
if(sce->r.scemode & R_PANORAMA) {
- for(base=scene->base.first; base;
base=base->next) {
+ for(base=sce->base.first; base;
base=base->next) {
ob= newlibadr(fd, lib, base->object);
if(ob->type == OB_CAMERA &&
!ob->id.lib) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
