Added some missing rna entries for scene, and added them to the scene buttons with...
authorMichael Fox <mfoxdogg@gmail.com>
Mon, 20 Apr 2009 04:58:22 +0000 (04:58 +0000)
committerMichael Fox <mfoxdogg@gmail.com>
Mon, 20 Apr 2009 04:58:22 +0000 (04:58 +0000)
release/ui/buttons_scene.py
source/blender/makesrna/intern/rna_scene.c

index 52f9560a061b3e6a382b46079e7a69ac7469a7ce..686f5b55e328326cc852048c4ec2a37d3e36ae79 100644 (file)
@@ -28,6 +28,8 @@ class RENDER_PT_shading(RenderButtonsPanel):
 
                layout.row()
                layout.itemR(rd, "alpha_mode")
+               layout.row()
+               layout.itemR(rd, "free_image_textures")
 
 class RENDER_PT_image(RenderButtonsPanel):
        __label__ = "Image"
@@ -47,9 +49,18 @@ class RENDER_PT_image(RenderButtonsPanel):
                layout.itemR(rd, "resolution_y", text="SizeY")
                layout.itemR(rd, "pixel_aspect_x", text="AspX")
                layout.itemR(rd, "pixel_aspect_y", text="AspY")
-
+               
+               layout.row()
+               layout.itemR(rd, "quality")
+               
+               layout.row()
+               layout.itemR(rd, "placeholders")
+               layout.itemR(rd, "no_overwrite")
+               layout.itemR(rd, "file_extensions")
+               
                layout.row()
                layout.itemR(rd, "crop_to_border")
+               layout.itemR(rd, "save_buffers")
 
 class RENDER_PT_antialiasing(RenderButtonsPanel):
        __label__ = "Anti-Aliasing"
@@ -67,6 +78,8 @@ class RENDER_PT_antialiasing(RenderButtonsPanel):
                layout.column_flow()
                layout.itemR(rd, "antialiasing", text="Enable")
                layout.itemR(rd, "antialiasing_samples", text="Samples")
+               if (rd.save_buffers):
+                       layout.itemR(rd, "full_sample")
                layout.itemR(rd, "pixel_filter")
                layout.itemR(rd, "filter_size")
 
@@ -91,6 +104,9 @@ class RENDER_PT_render(RenderButtonsPanel):
                layout.itemR(scene, "start_frame", text="Start")
                layout.itemR(scene, "end_frame", text="End")
                layout.itemR(scene, "current_frame", text="Frame")
+               layout.row()
+               layout.itemR(rd, "fps")
+               layout.itemR(rd, "fps_base",text="/")
 
                layout.row()
                layout.itemR(rd, "do_composite")
@@ -101,6 +117,7 @@ class RENDER_PT_render(RenderButtonsPanel):
 
                layout.row()
                layout.itemR(rd, "resolution_percentage", text="Size ")
+               layout.row()
                layout.itemR(rd, "dither_intensity")
 
                layout.row()
@@ -108,9 +125,10 @@ class RENDER_PT_render(RenderButtonsPanel):
                layout.itemR(rd, "parts_y")
 
                layout.row()
-               layout.itemR(rd, "threads")
                layout.itemR(rd, "threads_mode")
-
+               if (rd.threads_mode == 'THREADS_FIXED'):
+                       layout.itemR(rd, "threads")
+               
                layout.row()
                layout.itemR(rd, "fields", text="Fields")
                layout.itemR(rd, "field_order", text="Order")
@@ -121,9 +139,9 @@ class RENDER_PT_render(RenderButtonsPanel):
                layout.row()
                layout.itemR(rd, "border", text="Border Render")
                layout.itemR(rd, "panorama")
+               layout.itemR(rd, "backbuf")
 
-bpy.types.register(RENDER_PT_shading)
-bpy.types.register(RENDER_PT_image)
-bpy.types.register(RENDER_PT_antialiasing)
 bpy.types.register(RENDER_PT_render)
-
+bpy.types.register(RENDER_PT_antialiasing)
+bpy.types.register(RENDER_PT_shading)
+bpy.types.register(RENDER_PT_image)
\ No newline at end of file
index 145e231f9b18d9dc214caf1fa0c7db043483ebcc..5108bdabbc9d7d67a898fa4ab08873239c42948f 100644 (file)
@@ -194,7 +194,7 @@ void rna_def_scene_render_data(BlenderRNA *brna)
                {11, "OVERSAMPLE_11", "11", ""},
                {16, "OVERSAMPLE_16", "16", ""},
                {0, NULL, NULL, NULL}};
-       
+               
        static EnumPropertyItem field_order_items[] = {
                {0, "FIELDS_EVENFIRST", "Even Fields First", ""},
                {R_ODDFIELD, "FIELDS_ODDFIRST", "Odd Fields First", ""},
@@ -244,13 +244,31 @@ void rna_def_scene_render_data(BlenderRNA *brna)
        RNA_def_property_range(prop, 1.0f, 200.0f);
        RNA_def_property_ui_text(prop, "Pixel Aspect X", "Horizontal aspect ratio - for anamorphic or non-square pixel output");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
-
+       
        prop= RNA_def_property(srna, "pixel_aspect_y", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "yasp");
        RNA_def_property_range(prop, 1.0f, 200.0f);
        RNA_def_property_ui_text(prop, "Pixel Aspect Y", "Vertical aspect ratio - for anamorphic or non-square pixel output");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
        
+       prop= RNA_def_property(srna, "quality", PROP_INT, PROP_NONE);
+       RNA_def_property_int_sdna(prop, NULL, "quality");
+       RNA_def_property_range(prop, 1, 100);
+       RNA_def_property_ui_text(prop, "Quality", "Quality setting for JPEG images, AVI Jpeg and SGI movies.");
+       RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
+       
+       prop= RNA_def_property(srna, "fps", PROP_INT, PROP_NONE);
+       RNA_def_property_int_sdna(prop, NULL, "frs_sec");
+       RNA_def_property_range(prop, 1, 120);
+       RNA_def_property_ui_text(prop, "FPS", "Frames per second.");
+       RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
+       
+       prop= RNA_def_property(srna, "fps_base", PROP_FLOAT, PROP_NONE);
+       RNA_def_property_float_sdna(prop, NULL, "frs_sec_base");
+       RNA_def_property_range(prop, 0.1f, 120.0f);
+       RNA_def_property_ui_text(prop, "FPS Base", "Frames per second base");
+       RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
+       
        prop= RNA_def_property(srna, "dither_intensity", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "dither_intensity");
        RNA_def_property_range(prop, 0.0f, 2.0f);
@@ -414,6 +432,21 @@ void rna_def_scene_render_data(BlenderRNA *brna)
        RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FREE_IMAGE);
        RNA_def_property_ui_text(prop, "Free Image Textures", "Free all image texture from memory after render, to save memory before compositing.");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
+       
+       prop= RNA_def_property(srna, "save_buffers", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXR_TILE_FILE);
+       RNA_def_property_ui_text(prop, "Save Buffers","Save tiles for all RenderLayers and used SceneNodes to files in the temp directory (saves memory, allows Full Sampling).");
+       RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
+       
+       prop= RNA_def_property(srna, "full_sample", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FULL_SAMPLE);
+       RNA_def_property_ui_text(prop, "Full Sample","Saves for every OSA sample the entire RenderLayer results (Higher quality sampling but slower).");
+       RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
+       
+       prop= RNA_def_property(srna, "backbuf", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "bufflag", R_BACKBUF);
+       RNA_def_property_ui_text(prop, "Back Buffer", "Render backbuffer image");
+       RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
 }