diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-18 12:26:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-18 12:26:18 +0400 |
commit | 55ed0f050764fd91044d566005e3c10828a24eb7 (patch) | |
tree | 4a9db042131193d98d1bb14080ecd9fe0cdd7ea9 /release | |
parent | 513a907730e28f2c6da6ea7b1c94addd3d581d96 (diff) |
more rna renaming.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/rna_info.py | 2 | ||||
-rw-r--r-- | release/scripts/op/fcurve_euler_filter.py | 6 | ||||
-rw-r--r-- | release/scripts/ui/properties_animviz.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_bone.py | 30 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_curve.py | 4 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_modifier.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/properties_game.py | 10 | ||||
-rw-r--r-- | release/scripts/ui/properties_particle.py | 12 | ||||
-rw-r--r-- | release/scripts/ui/properties_physics_cloth.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/properties_physics_common.py | 6 | ||||
-rw-r--r-- | release/scripts/ui/properties_physics_smoke.py | 6 | ||||
-rw-r--r-- | release/scripts/ui/properties_physics_softbody.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/properties_texture.py | 10 | ||||
-rw-r--r-- | release/scripts/ui/space_info.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_nla.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_sequencer.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_time.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d_toolbar.py | 18 |
19 files changed, 61 insertions, 61 deletions
diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index fe53d2961be..98cd4bcbd3a 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -314,7 +314,7 @@ class InfoFunctionRNA: for rna_prop in rna_func.parameters.values(): prop = GetInfoPropertyRNA(rna_prop, parent_id) - if rna_prop.use_output: + if rna_prop.is_output: self.return_values.append(prop) else: self.args.append(prop) diff --git a/release/scripts/op/fcurve_euler_filter.py b/release/scripts/op/fcurve_euler_filter.py index c6f5ddd12e4..a2730e16843 100644 --- a/release/scripts/op/fcurve_euler_filter.py +++ b/release/scripts/op/fcurve_euler_filter.py @@ -7,7 +7,7 @@ def main(context): keys = [] for k in fcv.keyframe_points: - keys.append([k.handle1.copy(), k.co.copy(), k.handle2.copy()]) + keys.append([k.handle_left.copy(), k.co.copy(), k.handle_right.copy()]) print(keys) for i in range(len(keys)): @@ -34,9 +34,9 @@ def main(context): for i in range(len(keys)): for x in range(2): - fcv.keyframe_points[i].handle1[x] = keys[i][0][x] + fcv.keyframe_points[i].handle_left[x] = keys[i][0][x] fcv.keyframe_points[i].co[x] = keys[i][1][x] - fcv.keyframe_points[i].handle2[x] = keys[i][2][x] + fcv.keyframe_points[i].handle_right[x] = keys[i][2][x] flist = bpy.context.active_object.animation_data.action.fcurves for f in flist: diff --git a/release/scripts/ui/properties_animviz.py b/release/scripts/ui/properties_animviz.py index a3343559622..bbd849e4daf 100644 --- a/release/scripts/ui/properties_animviz.py +++ b/release/scripts/ui/properties_animviz.py @@ -32,7 +32,7 @@ class MotionPathButtonsPanel(): def draw_settings(self, context, avs, bones=False): layout = self.layout - mps = avs.motion_paths + mps = avs.motion_path layout.prop(mps, "type", expand=True) diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/ui/properties_data_bone.py index 7b49148ebd8..6f9a96ec27b 100644 --- a/release/scripts/ui/properties_data_bone.py +++ b/release/scripts/ui/properties_data_bone.py @@ -225,68 +225,68 @@ class BONE_PT_inverse_kinematics(BoneButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.25) split.prop(pchan, "ik_dof_x", text="X") - split.active = pchan.has_ik + split.active = pchan.is_in_ik_chain row = split.row() row.prop(pchan, "ik_stiffness_x", text="Stiffness", slider=True) - row.active = pchan.ik_dof_x and pchan.has_ik + row.active = pchan.ik_dof_x and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() sub.prop(pchan, "ik_limit_x", text="Limit") - sub.active = pchan.ik_dof_x and pchan.has_ik + sub.active = pchan.ik_dof_x and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_x", text="") sub.prop(pchan, "ik_max_x", text="") - sub.active = pchan.ik_dof_x and pchan.ik_limit_x and pchan.has_ik + sub.active = pchan.ik_dof_x and pchan.ik_limit_x and pchan.is_in_ik_chain split = layout.split(percentage=0.25) split.prop(pchan, "ik_dof_y", text="Y") - split.active = pchan.has_ik and pchan.has_ik + split.active = pchan.is_in_ik_chain and pchan.is_in_ik_chain row = split.row() row.prop(pchan, "ik_stiffness_y", text="Stiffness", slider=True) - row.active = pchan.ik_dof_y and pchan.has_ik + row.active = pchan.ik_dof_y and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() sub.prop(pchan, "ik_limit_y", text="Limit") - sub.active = pchan.ik_dof_y and pchan.has_ik + sub.active = pchan.ik_dof_y and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_y", text="") sub.prop(pchan, "ik_max_y", text="") - sub.active = pchan.ik_dof_y and pchan.ik_limit_y and pchan.has_ik + sub.active = pchan.ik_dof_y and pchan.ik_limit_y and pchan.is_in_ik_chain split = layout.split(percentage=0.25) split.prop(pchan, "ik_dof_z", text="Z") - split.active = pchan.has_ik and pchan.has_ik + split.active = pchan.is_in_ik_chain and pchan.is_in_ik_chain sub = split.row() sub.prop(pchan, "ik_stiffness_z", text="Stiffness", slider=True) - sub.active = pchan.ik_dof_z and pchan.has_ik + sub.active = pchan.ik_dof_z and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() sub.prop(pchan, "ik_limit_z", text="Limit") - sub.active = pchan.ik_dof_z and pchan.has_ik + sub.active = pchan.ik_dof_z and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_z", text="") sub.prop(pchan, "ik_max_z", text="") - sub.active = pchan.ik_dof_z and pchan.ik_limit_z and pchan.has_ik + sub.active = pchan.ik_dof_z and pchan.ik_limit_z and pchan.is_in_ik_chain split = layout.split() split.prop(pchan, "ik_stretch", text="Stretch", slider=True) split.label() - split.active = pchan.has_ik + split.active = pchan.is_in_ik_chain if ob.pose.ik_solver == 'ITASC': split = layout.split() col = split.column() col.prop(pchan, "ik_rot_control", text="Control Rotation") - col.active = pchan.has_ik + col.active = pchan.is_in_ik_chain col = split.column() col.prop(pchan, "ik_rot_weight", text="Weight", slider=True) - col.active = pchan.has_ik + col.active = pchan.is_in_ik_chain # not supported yet #row = layout.row() #row.prop(pchan, "ik_lin_control", text="Joint Size") diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/ui/properties_data_curve.py index ae8110f1298..b3a9f025f54 100644 --- a/release/scripts/ui/properties_data_curve.py +++ b/release/scripts/ui/properties_data_curve.py @@ -287,7 +287,7 @@ class DATA_PT_font(CurveButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Text on Curve:") - col.prop(text, "text_on_curve", text="") + col.prop(text, "follow_curve", text="") split = layout.split() @@ -357,7 +357,7 @@ class DATA_PT_textboxes(CurveButtonsPanel, bpy.types.Panel): col.operator("font.textbox_add", icon='ZOOMIN') col = split.column() - for i, box in enumerate(text.textboxes): + for i, box in enumerate(text.text_boxes): boxy = layout.box() diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 0bc6525f244..42fe9e26af3 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -687,7 +687,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): if md.texture_coordinates == 'MAP_UV' and ob.type == 'MESH': layout.prop_object(md, "uv_layer", ob.data, "uv_textures") elif md.texture_coordinates == 'OBJECT': - layout.prop(md, "texture_coordinates_object") + layout.prop(md, "texture_coords_object") layout.separator() diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index 4d45aca88b1..8ca4f9a3d11 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -215,7 +215,7 @@ class RENDER_PT_game_player(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings layout.prop(gs, "show_fullscreen") @@ -248,7 +248,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings stereo_mode = gs.stereo # stereo options: @@ -302,7 +302,7 @@ class RENDER_PT_game_shading(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings layout.prop(gs, "material_mode", expand=True) @@ -327,7 +327,7 @@ class RENDER_PT_game_performance(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings split = layout.split() @@ -454,7 +454,7 @@ class WORLD_PT_game_physics(WorldButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings layout.prop(gs, "physics_engine") if gs.physics_engine != 'NONE': diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index 01d7f5895ae..8d306385074 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -27,7 +27,7 @@ from properties_physics_common import basic_force_field_falloff_ui def particle_panel_enabled(context, psys): - return (psys.point_cache.baked is False) and (not psys.edited) and (not context.particle_system_editable) + return (psys.point_cache.is_baked is False) and (not psys.edited) and (not context.particle_system_editable) def particle_panel_poll(cls, context): @@ -116,15 +116,15 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.65) if part.type == 'HAIR': - if psys.edited: + if psys.is_edited: split.operator("particle.edited_clear", text="Free Edit") else: split.label(text="") row = split.row() row.enabled = particle_panel_enabled(context, psys) row.prop(part, "hair_step") - if psys.edited: - if psys.global_hair: + if psys.is_edited: + if psys.is_global_hair: layout.operator("particle.connect_hair") layout.label(text="Hair is disconnected.") else: @@ -153,7 +153,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel): psys = context.particle_system part = psys.settings - layout.enabled = particle_panel_enabled(context, psys) and not psys.multiple_caches + layout.enabled = particle_panel_enabled(context, psys) and not psys.has_multiple_caches row = layout.row() row.active = part.distribution != 'GRID' @@ -764,7 +764,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): if part.use_group_count and not part.whole_group: row = layout.row() - row.template_list(part, "dupliweights", part, "active_dupliweight_index") + row.template_list(part, "dupli_weights", part, "active_dupliweight_index") col = row.column() sub = col.row() diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py index b7e5e0f8144..7717c5b41fd 100644 --- a/release/scripts/ui/properties_physics_cloth.py +++ b/release/scripts/ui/properties_physics_cloth.py @@ -25,7 +25,7 @@ from properties_physics_common import effector_weights_ui def cloth_panel_enabled(md): - return md.point_cache.baked is False + return md.point_cache.is_baked is False class CLOTH_MT_presets(bpy.types.Menu): diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py index 81e05c8b0fd..e497492e6ff 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -29,7 +29,7 @@ def point_cache_ui(self, context, cache, enabled, cachetype): layout.set_context_pointer("point_cache", cache) row = layout.row() - row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2) + row.template_list(cache, "point_caches", cache, "active_point_cache_index", rows=2) col = row.column(align=True) col.operator("ptcache.add", icon='ZOOMIN', text="") col.operator("ptcache.remove", icon='ZOOMOUT', text="") @@ -84,13 +84,13 @@ def point_cache_ui(self, context, cache, enabled, cachetype): col = split.column() - if cache.baked == True: + if cache.is_baked == True: col.operator("ptcache.free_bake", text="Free Bake") else: col.operator("ptcache.bake", text="Bake").bake = True sub = col.row() - sub.enabled = (cache.frames_skipped or cache.outdated) and enabled + sub.enabled = (cache.frames_skipped or cache.is_outdated) and enabled sub.operator("ptcache.bake", text="Calculate To Frame").bake = False sub = col.column() diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py index 6d56ec97da4..822eb129b74 100644 --- a/release/scripts/ui/properties_physics_smoke.py +++ b/release/scripts/ui/properties_physics_smoke.py @@ -144,7 +144,7 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Collision Group:") - col.prop(group, "coll_group", text="") + col.prop(group, "collision_group", text="") class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, bpy.types.Panel): @@ -165,7 +165,7 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, bpy.types.Panel): layout.label(text="Compression:") layout.prop(md, "smoke_cache_comp", expand=True) - point_cache_ui(self, context, cache, (cache.baked is False), 'SMOKE') + point_cache_ui(self, context, cache, (cache.is_baked is False), 'SMOKE') class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, bpy.types.Panel): @@ -221,7 +221,7 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel, bpy.types.Panel): layout.label(text="Compression:") layout.prop(md, "smoke_cache_high_comp", expand=True) - point_cache_ui(self, context, cache, (cache.baked is False), 'SMOKE') + point_cache_ui(self, context, cache, (cache.is_baked is False), 'SMOKE') class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py index dd65899337a..887026f97c0 100644 --- a/release/scripts/ui/properties_physics_softbody.py +++ b/release/scripts/ui/properties_physics_softbody.py @@ -25,7 +25,7 @@ from properties_physics_common import effector_weights_ui def softbody_panel_enabled(md): - return (md.point_cache.baked is False) + return (md.point_cache.is_baked is False) class PhysicButtonsPanel(): diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 2306510271a..c3e5dc9fae2 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -850,10 +850,10 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, bpy.types.Panel): layout = self.layout tex = context.texture - vd = tex.voxeldata + vd = tex.voxel_data layout.prop(vd, "file_format") - if vd.file_format in ['BLENDER_VOXEL', 'RAW_8BIT']: + if vd.file_format in ('BLENDER_VOXEL', 'RAW_8BIT'): layout.prop(vd, "source_path") if vd.file_format == 'RAW_8BIT': layout.prop(vd, "resolution") @@ -889,7 +889,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, bpy.types.Panel): layout = self.layout tex = context.texture - pd = tex.pointdensity + pd = tex.point_density layout.prop(pd, "point_source", expand=True) @@ -945,7 +945,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): layout = self.layout tex = context.texture - pd = tex.pointdensity + pd = tex.point_density layout.prop(pd, "turbulence", text="") @@ -953,7 +953,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): layout = self.layout tex = context.texture - pd = tex.pointdensity + pd = tex.point_density layout.active = pd.turbulence split = layout.split() diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index ba101940ff4..62c021354db 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -265,7 +265,7 @@ class INFO_MT_game(bpy.types.Menu): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings layout.operator("view3d.game_start") diff --git a/release/scripts/ui/space_nla.py b/release/scripts/ui/space_nla.py index ceabc0af00f..bb979e0573e 100644 --- a/release/scripts/ui/space_nla.py +++ b/release/scripts/ui/space_nla.py @@ -122,7 +122,7 @@ class NLA_MT_edit(bpy.types.Menu): layout.separator() # TODO: names of these tools for 'tweakmode' need changing? - if scene.nla_tweakmode_on: + if scene.is_nla_tweakmode: layout.operator("nla.tweakmode_exit", text="Stop Tweaking Strip Actions") else: layout.operator("nla.tweakmode_enter", text="Start Tweaking Strip Actions") diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index 8f8393051a3..a331e747fdb 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -378,7 +378,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, bpy.types.Panel): row = col.row() row.label(text="Final Length: %s" % bpy.utils.smpte_from_frame(strip.frame_final_length)) row = col.row() - row.active = (frame_current >= strip.frame_start and frame_current <= strip.frame_start + strip.frame_length) + row.active = (frame_current >= strip.frame_start and frame_current <= strip.frame_start + strip.frame_duration) row.label(text="Playhead: %d" % (frame_current - strip.frame_start)) col.label(text="Frame Offset %d:%d" % (strip.frame_offset_start, strip.frame_offset_end)) diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index 49631399059..6f9bb3154e9 100644 --- a/release/scripts/ui/space_time.py +++ b/release/scripts/ui/space_time.py @@ -77,7 +77,7 @@ class TIME_HT_header(bpy.types.Header): layout.separator() row = layout.row(align=True) - row.prop_object(scene, "active_keying_set", scene, "all_keying_sets", text="") + row.prop_object(scene, "active_keying_set", scene, "keying_sets_all", text="") row.operator("anim.keyframe_insert", text="", icon='KEY_HLT') row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT') diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index eb868284005..36502564e1f 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -2012,7 +2012,7 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): layout = self.layout view = context.space_data - gs = context.scene.game_data + gs = context.scene.game_settings ob = context.object col = layout.column() diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index f889eb99c67..4ff90c53d3c 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -1308,37 +1308,37 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, bpy.types.Panel): if md.type == pe.type: ptcache = md.point_cache - if ptcache and len(ptcache.point_cache_list) > 1: - layout.template_list(ptcache, "point_cache_list", ptcache, "active_point_cache_index", type='ICONS') + if ptcache and len(ptcache.point_caches) > 1: + layout.template_list(ptcache, "point_caches", ptcache, "active_point_cache_index", type='ICONS') - if not pe.editable: + if not pe.is_editable: layout.label(text="Point cache must be baked") layout.label(text="to enable editing!") col = layout.column(align=True) - if pe.hair: - col.active = pe.editable + if pe.is_hair: + col.active = pe.is_editable col.prop(pe, "emitter_deflect", text="Deflect emitter") sub = col.row() sub.active = pe.emitter_deflect sub.prop(pe, "emitter_distance", text="Distance") col = layout.column(align=True) - col.active = pe.editable + col.active = pe.is_editable col.label(text="Keep:") col.prop(pe, "keep_lengths", text="Lengths") col.prop(pe, "keep_root", text="Root") - if not pe.hair: + if not pe.is_hair: col.label(text="Correct:") col.prop(pe, "auto_velocity", text="Velocity") col.prop(ob.data, "use_mirror_x") col = layout.column(align=True) - col.active = pe.editable + col.active = pe.is_editable col.label(text="Draw:") col.prop(pe, "draw_step", text="Path Steps") - if pe.hair: + if pe.is_hair: col.prop(pe, "show_particles", text="Children") else: if pe.type == 'PARTICLES': |