From 54e6ea70c03330a1e083ded36053ab4140880af3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 18 Aug 2010 04:10:23 +0000 Subject: rna renaming for Render* structs --- release/scripts/modules/bpyml.py | 24 ++-- release/scripts/op/presets.py | 48 +++---- release/scripts/op/screen_play_rendered_anim.py | 2 +- release/scripts/ui/properties_data_lamp.py | 6 +- release/scripts/ui/properties_render.py | 160 ++++++++++++------------ release/scripts/ui/properties_scene.py | 2 +- release/scripts/ui/space_info.py | 2 +- release/scripts/ui/space_node.py | 2 +- 8 files changed, 123 insertions(+), 123 deletions(-) (limited to 'release') diff --git a/release/scripts/modules/bpyml.py b/release/scripts/modules/bpyml.py index f30a4b8d9ac..a2ba9ec8006 100644 --- a/release/scripts/modules/bpyml.py +++ b/release/scripts/modules/bpyml.py @@ -163,18 +163,18 @@ if __name__ == "__main__": ui() [ split() [ column() [ - prop(data='context.scene.render', property='stamp_time', text='Time'), - prop(data='context.scene.render', property='stamp_date', text='Date'), - prop(data='context.scene.render', property='stamp_render_time', text='RenderTime'), - prop(data='context.scene.render', property='stamp_frame', text='Frame'), - prop(data='context.scene.render', property='stamp_scene', text='Scene'), - prop(data='context.scene.render', property='stamp_camera', text='Camera'), - prop(data='context.scene.render', property='stamp_filename', text='Filename'), - prop(data='context.scene.render', property='stamp_marker', text='Marker'), - prop(data='context.scene.render', property='stamp_sequencer_strip', text='Seq. Strip') + prop(data='context.scene.render', property='use_stamp_time', text='Time'), + prop(data='context.scene.render', property='use_stamp_date', text='Date'), + prop(data='context.scene.render', property='use_stamp_render_time', text='RenderTime'), + prop(data='context.scene.render', property='use_stamp_frame', text='Frame'), + prop(data='context.scene.render', property='use_stamp_scene', text='Scene'), + prop(data='context.scene.render', property='use_stamp_camera', text='Camera'), + prop(data='context.scene.render', property='use_stamp_filename', text='Filename'), + prop(data='context.scene.render', property='use_stamp_marker', text='Marker'), + prop(data='context.scene.render', property='use_stamp_sequencer_strip', text='Seq. Strip') ], column() [ - active(expr='context.scene.render.render_stamp'), + active(expr='context.scene.render.use_stamp'), prop(data='context.scene.render', property='stamp_foreground', slider=True), prop(data='context.scene.render', property='stamp_background', slider=True), separator(), @@ -182,9 +182,9 @@ if __name__ == "__main__": ] ], split(percentage=0.2) [ - prop(data='context.scene.render', property='stamp_note', text='Note'), + prop(data='context.scene.render', property='use_stamp_note', text='Note'), row() [ - active(expr='context.scene.render.stamp_note'), + active(expr='context.scene.render.use_stamp_note'), prop(data='context.scene.render', property='stamp_note_text', text='') ] ] diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index 529e51f6cce..be68a7f1609 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -98,16 +98,16 @@ class AddPresetRender(AddPresetBase, bpy.types.Operator): name = AddPresetBase.name preset_values = [ - "bpy.context.scene.render.resolution_x", - "bpy.context.scene.render.resolution_y", - "bpy.context.scene.render.pixel_aspect_x", - "bpy.context.scene.render.pixel_aspect_y", + "bpy.context.scene.render.field_order", "bpy.context.scene.render.fps", "bpy.context.scene.render.fps_base", + "bpy.context.scene.render.pixel_aspect_x", + "bpy.context.scene.render.pixel_aspect_y", "bpy.context.scene.render.resolution_percentage", - "bpy.context.scene.render.fields", - "bpy.context.scene.render.field_order", - "bpy.context.scene.render.fields_still", + "bpy.context.scene.render.resolution_x", + "bpy.context.scene.render.resolution_y", + "bpy.context.scene.render.use_fields", + "bpy.context.scene.render.use_fields_still", ] preset_subdir = "render" @@ -145,12 +145,12 @@ class AddPresetCloth(AddPresetBase, bpy.types.Operator): name = AddPresetBase.name preset_values = [ - "bpy.context.cloth.settings.quality", - "bpy.context.cloth.settings.mass", - "bpy.context.cloth.settings.structural_stiffness", + "bpy.context.cloth.settings.air_damping", "bpy.context.cloth.settings.bending_stiffness", + "bpy.context.cloth.settings.mass", + "bpy.context.cloth.settings.quality", "bpy.context.cloth.settings.spring_damping", - "bpy.context.cloth.settings.air_damping", + "bpy.context.cloth.settings.structural_stiffness", ] preset_subdir = "cloth" @@ -163,19 +163,19 @@ class AddPresetSunSky(AddPresetBase, bpy.types.Operator): name = AddPresetBase.name preset_values = [ + "bpy.context.object.data.sky.atmosphere_extinction", + "bpy.context.object.data.sky.atmosphere_inscattering", "bpy.context.object.data.sky.atmosphere_turbidity", - "bpy.context.object.data.sky.sky_blend_type", - "bpy.context.object.data.sky.sky_blend", + "bpy.context.object.data.sky.backscattered_light", "bpy.context.object.data.sky.horizon_brightness", "bpy.context.object.data.sky.spread", - "bpy.context.object.data.sky.sky_color_space", - "bpy.context.object.data.sky.sky_exposure", "bpy.context.object.data.sky.sun_brightness", - "bpy.context.object.data.sky.sun_size", - "bpy.context.object.data.sky.backscattered_light", "bpy.context.object.data.sky.sun_intensity", - "bpy.context.object.data.sky.atmosphere_inscattering", - "bpy.context.object.data.sky.atmosphere_extinction", + "bpy.context.object.data.sky.sun_size", + "bpy.context.object.data.sky.use_sky_blend", + "bpy.context.object.data.sky.use_sky_blend_type", + "bpy.context.object.data.sky.use_sky_color_space", + "bpy.context.object.data.sky.use_sky_exposure", ] preset_subdir = "sunsky" @@ -191,14 +191,14 @@ class AddPresetInteraction(AddPresetBase, bpy.types.Operator): preset_values = [ "bpy.context.user_preferences.edit.use_drag_immediately", "bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb", - "bpy.context.user_preferences.inputs.select_mouse", - "bpy.context.user_preferences.inputs.view_zoom_method", - "bpy.context.user_preferences.inputs.view_zoom_axis", - "bpy.context.user_preferences.inputs.view_rotate_method", "bpy.context.user_preferences.inputs.invert_mouse_wheel_zoom", + "bpy.context.user_preferences.inputs.select_mouse", "bpy.context.user_preferences.inputs.use_emulate_numpad", - "bpy.context.user_preferences.inputs.use_mouse_emulate_3_button", "bpy.context.user_preferences.inputs.use_mouse_continuous", + "bpy.context.user_preferences.inputs.use_mouse_emulate_3_button", + "bpy.context.user_preferences.inputs.view_rotate_method", + "bpy.context.user_preferences.inputs.view_zoom_axis", + "bpy.context.user_preferences.inputs.view_zoom_method", ] preset_subdir = "interaction" diff --git a/release/scripts/op/screen_play_rendered_anim.py b/release/scripts/op/screen_play_rendered_anim.py index 8775a144b2d..80260755714 100644 --- a/release/scripts/op/screen_play_rendered_anim.py +++ b/release/scripts/op/screen_play_rendered_anim.py @@ -79,7 +79,7 @@ class PlayRenderedAnim(bpy.types.Operator): preset = prefs.filepaths.animation_player_preset player_path = prefs.filepaths.animation_player - file_path = bpy.path.abspath(rd.output_path) + file_path = bpy.path.abspath(rd.filepath) is_movie = rd.is_movie_format # try and guess a command line if it doesn't exist diff --git a/release/scripts/ui/properties_data_lamp.py b/release/scripts/ui/properties_data_lamp.py index 91ccce3b011..5eca7c09198 100644 --- a/release/scripts/ui/properties_data_lamp.py +++ b/release/scripts/ui/properties_data_lamp.py @@ -125,7 +125,7 @@ class DATA_PT_sunsky(DataButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - lamp = context.lamp.sky + lamp = context.lamp.use_sky row = layout.row(align=True) row.prop(lamp, "use_sky") @@ -357,9 +357,9 @@ class DATA_PT_spot(DataButtonsPanel, bpy.types.Panel): col = split.column() - col.prop(lamp, "halo") + col.prop(lamp, "use_halo") sub = col.column(align=True) - sub.active = lamp.halo + sub.active = lamp.use_halo sub.prop(lamp, "halo_intensity", text="Intensity") if lamp.shadow_method == 'BUFFER_SHADOW': sub.prop(lamp, "halo_step", text="Step") diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py index 6e8ebb10691..a0e284ab1f3 100644 --- a/release/scripts/ui/properties_render.py +++ b/release/scripts/ui/properties_render.py @@ -98,9 +98,9 @@ class RENDER_PT_layers(RenderButtonsPanel, bpy.types.Panel): col.prop(rl, "material_override", text="Material") col = split.column() - col.prop(rl, "visible_layers", text="Layer") + col.prop(rl, "layers", text="Layer") col.label(text="Mask Layers:") - col.prop(rl, "zmask_layers", text="") + col.prop(rl, "layers_zmask", text="") layout.separator() @@ -109,21 +109,21 @@ class RENDER_PT_layers(RenderButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(rl, "zmask") + col.prop(rl, "use_zmask") row = col.row() - row.prop(rl, "zmask_negate", text="Negate") - row.active = rl.zmask - col.prop(rl, "all_z") + row.prop(rl, "invert_zmask", text="Negate") + row.active = rl.use_zmask + col.prop(rl, "use_all_z") col = split.column() - col.prop(rl, "solid") - col.prop(rl, "halo") - col.prop(rl, "ztransp") + col.prop(rl, "use_solid") + col.prop(rl, "use_halo") + col.prop(rl, "use_ztransp") col = split.column() - col.prop(rl, "sky") - col.prop(rl, "edge") - col.prop(rl, "strand") + col.prop(rl, "use_sky") + col.prop(rl, "use_edge_enhance") + col.prop(rl, "use_strand") layout.separator() @@ -131,42 +131,42 @@ class RENDER_PT_layers(RenderButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Passes:") - col.prop(rl, "pass_combined") - col.prop(rl, "pass_z") - col.prop(rl, "pass_vector") - col.prop(rl, "pass_normal") - col.prop(rl, "pass_uv") - col.prop(rl, "pass_mist") - col.prop(rl, "pass_object_index") - col.prop(rl, "pass_color") + col.prop(rl, "use_pass_combined") + col.prop(rl, "use_pass_z") + col.prop(rl, "use_pass_vector") + col.prop(rl, "use_pass_normal") + col.prop(rl, "use_pass_uv") + col.prop(rl, "use_pass_mist") + col.prop(rl, "use_pass_object_index") + col.prop(rl, "use_pass_color") col = split.column() col.label() - col.prop(rl, "pass_diffuse") + col.prop(rl, "use_pass_diffuse") row = col.row() - row.prop(rl, "pass_specular") - row.prop(rl, "pass_specular_exclude", text="") + row.prop(rl, "use_pass_specular") + row.prop(rl, "exclude_specular", text="") row = col.row() - row.prop(rl, "pass_shadow") - row.prop(rl, "pass_shadow_exclude", text="") + row.prop(rl, "use_pass_shadow") + row.prop(rl, "exclude_shadow", text="") row = col.row() - row.prop(rl, "pass_emit") - row.prop(rl, "pass_emit_exclude", text="") + row.prop(rl, "use_pass_emit") + row.prop(rl, "exclude_emit", text="") row = col.row() - row.prop(rl, "pass_ao") - row.prop(rl, "pass_ao_exclude", text="") + row.prop(rl, "use_pass_ambient_occlusion") + row.prop(rl, "exclude_ambient_occlusion", text="") row = col.row() - row.prop(rl, "pass_environment") - row.prop(rl, "pass_environment_exclude", text="") + row.prop(rl, "use_pass_environment") + row.prop(rl, "exclude_environment", text="") row = col.row() - row.prop(rl, "pass_indirect") - row.prop(rl, "pass_indirect_exclude", text="") + row.prop(rl, "use_pass_indirect") + row.prop(rl, "exclude_indirect", text="") row = col.row() - row.prop(rl, "pass_reflection") - row.prop(rl, "pass_reflection_exclude", text="") + row.prop(rl, "use_pass_reflection") + row.prop(rl, "exclude_reflection", text="") row = col.row() - row.prop(rl, "pass_refraction") - row.prop(rl, "pass_refraction_exclude", text="") + row.prop(rl, "use_pass_refraction") + row.prop(rl, "exclude_refraction", text="") class RENDER_PT_shading(RenderButtonsPanel, bpy.types.Panel): @@ -187,8 +187,8 @@ class RENDER_PT_shading(RenderButtonsPanel, bpy.types.Panel): col.prop(rd, "use_envmaps", text="Environment Map") col = split.column() - col.prop(rd, "use_raytracing", text="Ray Tracing") - col.prop(rd, "color_management") + col.prop(rd, "use_raytrace", text="Ray Tracing") + col.prop(rd, "use_color_management") col.prop(rd, "alpha_mode", text="Alpha") @@ -218,16 +218,16 @@ class RENDER_PT_performance(RenderButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Memory:") sub = col.column() - sub.enabled = not (rd.use_border or rd.full_sample) - sub.prop(rd, "save_buffers") + sub.enabled = not (rd.use_border or rd.use_full_sample) + sub.prop(rd, "use_save_buffers") sub = col.column() sub.active = rd.use_compositing - sub.prop(rd, "free_image_textures") + sub.prop(rd, "use_free_image_textures") sub = col.column() - sub.active = rd.use_raytracing + sub.active = rd.use_raytrace sub.label(text="Acceleration structure:") - sub.prop(rd, "raytrace_structure", text="") - if rd.raytrace_structure == 'OCTREE': + sub.prop(rd, "raytrace_method", text="") + if rd.raytrace_method == 'OCTREE': sub.prop(rd, "octree_resolution", text="Resolution") else: sub.prop(rd, "use_instances", text="Instances") @@ -258,17 +258,17 @@ class RENDER_PT_post_processing(RenderButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(rd, "fields", text="Fields") + col.prop(rd, "use_fields", text="Fields") sub = col.column() - sub.active = rd.fields + sub.active = rd.use_fields sub.row().prop(rd, "field_order", expand=True) - sub.prop(rd, "fields_still", text="Still") + sub.prop(rd, "use_fields_still", text="Still") col = split.column() - col.prop(rd, "edge") + col.prop(rd, "use_edge_enhance") sub = col.column() - sub.active = rd.edge + sub.active = rd.use_edge_enhance sub.prop(rd, "edge_threshold", text="Threshold", slider=True) sub.prop(rd, "edge_color", text="") @@ -283,7 +283,7 @@ class RENDER_PT_output(RenderButtonsPanel, bpy.types.Panel): rd = context.scene.render file_format = rd.file_format - layout.prop(rd, "output_path", text="") + layout.prop(rd, "filepath", text="") split = layout.split() col = split.column() @@ -339,17 +339,17 @@ class RENDER_PT_output(RenderButtonsPanel, bpy.types.Panel): elif file_format in ('CINEON', 'DPX'): split = layout.split() col = split.column() - col.prop(rd, "cineon_log", text="Convert to Log") + col.prop(rd, "use_cineon_log", text="Convert to Log") col = split.column(align=True) - col.active = rd.cineon_log + col.active = rd.use_cineon_log col.prop(rd, "cineon_black", text="Black") col.prop(rd, "cineon_white", text="White") col.prop(rd, "cineon_gamma", text="Gamma") elif file_format == 'TIFF': split = layout.split() - split.prop(rd, "tiff_bit") + split.prop(rd, "use_tiff_16bit") elif file_format == 'QUICKTIME_CARBON': split = layout.split() @@ -462,13 +462,13 @@ class RENDER_PT_antialiasing(RenderButtonsPanel, bpy.types.Panel): def draw_header(self, context): rd = context.scene.render - self.layout.prop(rd, "render_antialiasing", text="") + self.layout.prop(rd, "use_antialiasing", text="") def draw(self, context): layout = self.layout rd = context.scene.render - layout.active = rd.render_antialiasing + layout.active = rd.use_antialiasing split = layout.split() @@ -476,10 +476,10 @@ class RENDER_PT_antialiasing(RenderButtonsPanel, bpy.types.Panel): col.row().prop(rd, "antialiasing_samples", expand=True) sub = col.row() sub.enabled = not rd.use_border - sub.prop(rd, "full_sample") + sub.prop(rd, "use_full_sample") col = split.column() - col.prop(rd, "pixel_filter", text="") + col.prop(rd, "pixel_filter_type", text="") col.prop(rd, "filter_size", text="Size") @@ -491,13 +491,13 @@ class RENDER_PT_motion_blur(RenderButtonsPanel, bpy.types.Panel): def draw_header(self, context): rd = context.scene.render - self.layout.prop(rd, "motion_blur", text="") + self.layout.prop(rd, "use_motion_blur", text="") def draw(self, context): layout = self.layout rd = context.scene.render - layout.active = rd.motion_blur + layout.active = rd.use_motion_blur row = layout.row() row.prop(rd, "motion_blur_samples") @@ -534,7 +534,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel, bpy.types.Panel): row.prop(rd, "use_border", text="Border") sub = row.row() sub.active = rd.use_border - sub.prop(rd, "crop_to_border", text="Crop") + sub.prop(rd, "use_crop_to_border", text="Crop") col = split.column() sub = col.column(align=True) @@ -556,39 +556,39 @@ class RENDER_PT_stamp(RenderButtonsPanel, bpy.types.Panel): def draw_header(self, context): rd = context.scene.render - self.layout.prop(rd, "render_stamp", text="") + self.layout.prop(rd, "use_stamp", text="") def draw(self, context): layout = self.layout rd = context.scene.render - layout.active = rd.render_stamp + layout.active = rd.use_stamp split = layout.split() col = split.column() - col.prop(rd, "stamp_time", text="Time") - col.prop(rd, "stamp_date", text="Date") - col.prop(rd, "stamp_render_time", text="RenderTime") - col.prop(rd, "stamp_frame", text="Frame") - col.prop(rd, "stamp_scene", text="Scene") - col.prop(rd, "stamp_camera", text="Camera") - col.prop(rd, "stamp_filename", text="Filename") - col.prop(rd, "stamp_marker", text="Marker") - col.prop(rd, "stamp_sequencer_strip", text="Seq. Strip") + col.prop(rd, "use_stamp_time", text="Time") + col.prop(rd, "use_stamp_date", text="Date") + col.prop(rd, "use_stamp_render_time", text="RenderTime") + col.prop(rd, "use_stamp_frame", text="Frame") + col.prop(rd, "use_stamp_scene", text="Scene") + col.prop(rd, "use_stamp_camera", text="Camera") + col.prop(rd, "use_stamp_filename", text="Filename") + col.prop(rd, "use_stamp_marker", text="Marker") + col.prop(rd, "use_stamp_sequencer_strip", text="Seq. Strip") col = split.column() - col.active = rd.render_stamp + col.active = rd.use_stamp col.prop(rd, "stamp_foreground", slider=True) col.prop(rd, "stamp_background", slider=True) col.separator() col.prop(rd, "stamp_font_size", text="Font Size") row = layout.split(percentage=0.2) - row.prop(rd, "stamp_note", text="Note") + row.prop(rd, "use_stamp_note", text="Note") sub = row.row() - sub.active = rd.stamp_note + sub.active = rd.use_stamp_note sub.prop(rd, "stamp_note_text", text="") @@ -609,24 +609,24 @@ class RENDER_PT_bake(RenderButtonsPanel, bpy.types.Panel): if rd.bake_type == 'NORMALS': layout.prop(rd, "bake_normal_space") elif rd.bake_type in ('DISPLACEMENT', 'AO'): - layout.prop(rd, "bake_normalized") + layout.prop(rd, "use_bake_normalize") # col.prop(rd, "bake_aa_mode") - # col.prop(rd, "bake_enable_aa") + # col.prop(rd, "use_bake_antialiasing") layout.separator() split = layout.split() col = split.column() - col.prop(rd, "bake_clear") + col.prop(rd, "use_bake_clear") col.prop(rd, "bake_margin") col.prop(rd, "bake_quad_split", text="Split") col = split.column() - col.prop(rd, "bake_active") + col.prop(rd, "use_bake_selected_to_active") sub = col.column() - sub.active = rd.bake_active + sub.active = rd.use_bake_selected_to_active sub.prop(rd, "bake_distance") sub.prop(rd, "bake_bias") diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py index d5b2fd6e3ec..8e7362da44c 100644 --- a/release/scripts/ui/properties_scene.py +++ b/release/scripts/ui/properties_scene.py @@ -193,7 +193,7 @@ class SCENE_PT_simplify(SceneButtonsPanel, bpy.types.Panel): col.prop(rd, "simplify_subdivision", text="Subdivision") col.prop(rd, "simplify_child_particles", text="Child Particles") - col.prop(rd, "simplify_triangulate") + col.prop(rd, "use_simplify_triangulate") col = split.column() col.prop(rd, "simplify_shadow_samples", text="Shadow Samples") diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index 1206bfdef00..ba101940ff4 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -58,7 +58,7 @@ class INFO_HT_header(bpy.types.Header): layout.separator() - if rd.multiple_engines: + if rd.has_multiple_engines: layout.prop(rd, "engine", text="") layout.separator() diff --git a/release/scripts/ui/space_node.py b/release/scripts/ui/space_node.py index 715d684e288..cd1425ee122 100644 --- a/release/scripts/ui/space_node.py +++ b/release/scripts/ui/space_node.py @@ -66,7 +66,7 @@ class NODE_HT_header(bpy.types.Header): scene = snode.id layout.prop(scene, "use_nodes") - layout.prop(scene.render, "free_unused_nodes", text="Free Unused") + layout.prop(scene.render, "use_free_unused_nodes", text="Free Unused") layout.prop(snode, "show_backdrop") layout.separator() -- cgit v1.2.3