- fix for a crash in readfile.c, thanks Roelf for finding.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 6 Aug 2009 23:19:05 +0000 (23:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 6 Aug 2009 23:19:05 +0000 (23:19 +0000)
- add media option for povray
- remove unintentional line from modifier script

release/io/engine_render_pov.py
release/ui/buttons_data_modifier.py
source/blender/blenloader/intern/readfile.c

index 44f34d890f6ef29ab81856efbd3cb094657f6325..782d87fcdf3c1646b7dc0bded499594964ffb916 100644 (file)
@@ -442,6 +442,7 @@ def write_pov(filename, scene=None, info_callback = None):
                        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,9 +450,7 @@ def write_pov(filename, scene=None, info_callback = None):
                        file.write('\t}\n')
                
                file.write('}\n')
-                       
-
-               
+       
        
        exportCamera()
        #exportMaterials()
@@ -699,6 +698,7 @@ class SCENE_PT_povray_radiosity(RenderButtonsPanel):
                        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 @@ FloatProperty(     attr="pov_radio_low_error_factor",
 
 # 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).",
index f92bbd1581e12acb05b94f58c498fae34f4d45d3..2b13034af9f9efb139829ca0055488c097309e1b 100644 (file)
@@ -17,8 +17,6 @@ class DATA_PT_modifiers(DataButtonsPanel):
                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)
index f52afd9391ddb2c0fc46e234ee869c9244bc17ad..60559cc2d8d173b6d68dc67041e6ae42f2c6f84a 100644 (file)
@@ -9205,7 +9205,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
                        /* 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) {