From 3bd039eff9ddd847ed6428b2bcad506b4eb4d1db Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Aug 2010 17:03:52 +0000 Subject: apply rna rename most of the show_*, names. --- release/scripts/io/import_shape_mdd.py | 4 +-- release/scripts/modules/rigify/__init__.py | 2 +- release/scripts/op/object.py | 2 +- release/scripts/op/uv.py | 2 +- release/scripts/ui/properties_animviz.py | 6 ++-- release/scripts/ui/properties_data_armature.py | 12 ++++---- release/scripts/ui/properties_data_bone.py | 2 +- release/scripts/ui/properties_data_mesh.py | 6 ++-- release/scripts/ui/properties_data_modifier.py | 16 +++++------ release/scripts/ui/properties_game.py | 2 +- release/scripts/ui/properties_object.py | 16 +++++------ release/scripts/ui/properties_object_constraint.py | 2 +- release/scripts/ui/properties_particle.py | 10 +++---- release/scripts/ui/properties_physics_cloth.py | 2 +- release/scripts/ui/properties_physics_field.py | 2 +- release/scripts/ui/properties_physics_fluid.py | 4 +-- release/scripts/ui/properties_physics_smoke.py | 4 +-- release/scripts/ui/properties_physics_softbody.py | 2 +- release/scripts/ui/space_dopesheet.py | 2 +- release/scripts/ui/space_filebrowser.py | 2 +- release/scripts/ui/space_image.py | 6 ++-- release/scripts/ui/space_info.py | 2 +- release/scripts/ui/space_userpref.py | 8 +++--- release/scripts/ui/space_userpref_keymap.py | 18 ++++++------ release/scripts/ui/space_view3d.py | 32 +++++++++++----------- release/scripts/ui/space_view3d_toolbar.py | 6 ++-- 26 files changed, 86 insertions(+), 86 deletions(-) (limited to 'release') diff --git a/release/scripts/io/import_shape_mdd.py b/release/scripts/io/import_shape_mdd.py index 522f860684f..c7b199918a2 100644 --- a/release/scripts/io/import_shape_mdd.py +++ b/release/scripts/io/import_shape_mdd.py @@ -66,7 +66,7 @@ def mdd_import(filepath, ob, scene, PREF_START_FRAME=0, PREF_JUMP=1): ob.active_shape_key_index = len(ob.data.shape_keys.keys)-1 index = len(ob.data.shape_keys.keys)-1 - ob.shape_key_lock = True + ob.show_shape_key = True verts = ob.data.shape_keys.keys[len(ob.data.shape_keys.keys)-1].data @@ -74,7 +74,7 @@ def mdd_import(filepath, ob, scene, PREF_START_FRAME=0, PREF_JUMP=1): for v in verts: # 12 is the size of 3 floats v.co[:] = unpack('>3f', file.read(12)) #me.update() - ob.shape_key_lock = False + ob.show_shape_key = False # insert keyframes diff --git a/release/scripts/modules/rigify/__init__.py b/release/scripts/modules/rigify/__init__.py index dafcc381832..f38186aca28 100644 --- a/release/scripts/modules/rigify/__init__.py +++ b/release/scripts/modules/rigify/__init__.py @@ -465,7 +465,7 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): # obj.hide = True - obj.data.draw_axes = False + obj.data.show_axes = False bpy.ops.object.mode_set(mode=mode_orig) obj_orig.data.pose_position = rest_backup diff --git a/release/scripts/op/object.py b/release/scripts/op/object.py index 476db76735e..56c4394c796 100644 --- a/release/scripts/op/object.py +++ b/release/scripts/op/object.py @@ -256,7 +256,7 @@ class ShapeTransfer(bpy.types.Operator): key = ob.add_shape_key(from_mix=False) # we need a rest key.name = name ob.active_shape_key_index = len(me.shape_keys.keys) - 1 - ob.shape_key_lock = True + ob.show_shape_key = True from geometry import BarycentricTransform from mathutils import Vector diff --git a/release/scripts/op/uv.py b/release/scripts/op/uv.py index 7d677181858..cf3d68787c0 100644 --- a/release/scripts/op/uv.py +++ b/release/scripts/op/uv.py @@ -76,7 +76,7 @@ class ExportUVLayout(bpy.types.Operator): local_image = Ellipsis - if context.tool_settings.uv_local_view: + if context.tool_settings.show_uv_local_view: space_data = self._space_image(context) if space_data: local_image = space_data.image diff --git a/release/scripts/ui/properties_animviz.py b/release/scripts/ui/properties_animviz.py index b337485ae10..a3343559622 100644 --- a/release/scripts/ui/properties_animviz.py +++ b/release/scripts/ui/properties_animviz.py @@ -54,9 +54,9 @@ class MotionPathButtonsPanel(): col = split.column() col.label(text="Display:") col.prop(mps, "show_frame_numbers", text="Frame Numbers") - col.prop(mps, "highlight_keyframes", text="Keyframes") + col.prop(mps, "show_keyframe_highlight", text="Keyframes") if bones: - col.prop(mps, "search_all_action_keyframes", text="+ Non-Grouped Keyframes") + col.prop(mps, "show_keyframe_action_all", text="+ Non-Grouped Keyframes") col.prop(mps, "show_keyframe_numbers", text="Keyframe Numbers") @@ -89,7 +89,7 @@ class OnionSkinButtonsPanel(): col = split.column() col.label(text="Display:") - col.prop(arm, "ghost_only_selected", text="Selected Only") + col.prop(arm, "show_only_ghost_selected", text="Selected Only") diff --git a/release/scripts/ui/properties_data_armature.py b/release/scripts/ui/properties_data_armature.py index 29ef85e6c60..f91ee3ccc5a 100644 --- a/release/scripts/ui/properties_data_armature.py +++ b/release/scripts/ui/properties_data_armature.py @@ -95,13 +95,13 @@ class DATA_PT_display(ArmatureButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(arm, "draw_names", text="Names") - col.prop(arm, "draw_axes", text="Axes") - col.prop(arm, "draw_custom_bone_shapes", text="Shapes") + col.prop(arm, "show_names", text="Names") + col.prop(arm, "show_axes", text="Axes") + col.prop(arm, "show_bone_custom_shapes", text="Shapes") col = split.column() - col.prop(arm, "draw_group_colors", text="Colors") - col.prop(ob, "x_ray", text="X-Ray") + col.prop(arm, "show_group_colors", text="Colors") + col.prop(ob, "show_x_ray", text="X-Ray") col.prop(arm, "delay_deform", text="Delay Refresh") @@ -179,7 +179,7 @@ class DATA_PT_ghost(ArmatureButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Display:") - col.prop(arm, "ghost_only_selected", text="Selected Only") + col.prop(arm, "show_only_ghost_selected", text="Selected Only") class DATA_PT_iksolver_itasc(ArmatureButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/ui/properties_data_bone.py index 973cb115a2f..fea1c185ec9 100644 --- a/release/scripts/ui/properties_data_bone.py +++ b/release/scripts/ui/properties_data_bone.py @@ -194,7 +194,7 @@ class BONE_PT_display(BoneButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(bone, "draw_wire", text="Wireframe") + col.prop(bone, "show_wire", text="Wireframe") col.prop(bone, "hide", text="Hide") col = split.column() diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py index 7a5f7e3f3ff..4c4c4c754e2 100644 --- a/release/scripts/ui/properties_data_mesh.py +++ b/release/scripts/ui/properties_data_mesh.py @@ -98,7 +98,7 @@ class DATA_PT_normals(MeshButtonsPanel, bpy.types.Panel): col = split.column() - col.prop(mesh, "double_sided") + col.prop(mesh, "show_double_sided") class DATA_PT_settings(MeshButtonsPanel, bpy.types.Panel): @@ -182,7 +182,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel): enable_edit = ob.mode != 'EDIT' enable_edit_value = False - if ob.shape_key_lock is False: + if ob.show_shape_key is False: if enable_edit or (ob.type == 'MESH' and ob.shape_key_edit_mode): enable_edit_value = True @@ -218,7 +218,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel): sub = row.row(align=True) subsub = sub.row(align=True) subsub.active = enable_edit_value - subsub.prop(ob, "shape_key_lock", text="") + subsub.prop(ob, "show_shape_key", text="") subsub.prop(kb, "mute", text="") sub.prop(ob, "shape_key_edit_mode", text="") diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 2847810f417..0bc6525f244 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -264,9 +264,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.prop(md, "split_edges") - col.prop(md, "unborn") - col.prop(md, "alive") - col.prop(md, "dead") + col.prop(md, "show_unborn") + col.prop(md, "show_alive") + col.prop(md, "show_dead") col.prop(md, "size") layout.operator("object.explode_refresh", text="Refresh") @@ -403,7 +403,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.operator("object.multires_subdivide", text="Subdivide") col.operator("object.multires_higher_levels_delete", text="Delete Higher") col.operator("object.multires_reshape", text="Reshape") - col.prop(md, "optimal_display") + col.prop(md, "show_only_control_edges") layout.separator() @@ -431,9 +431,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Show Particles When:") - col.prop(md, "alive") - col.prop(md, "unborn") - col.prop(md, "dead") + col.prop(md, "show_alive") + col.prop(md, "show_unborn") + col.prop(md, "show_dead") layout.separator() @@ -612,7 +612,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Options:") col.prop(md, "subsurf_uv") - col.prop(md, "optimal_display") + col.prop(md, "show_only_control_edges") def SURFACE(self, layout, ob, md): layout.label(text="See Fields panel.") diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index 608976f373c..3e63e21d4ab 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -217,7 +217,7 @@ class RENDER_PT_game_player(RenderButtonsPanel, bpy.types.Panel): gs = context.scene.game_data - layout.prop(gs, "fullscreen") + layout.prop(gs, "show_fullscreen") split = layout.split() diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py index 3af0cdef1e4..fc17273116b 100644 --- a/release/scripts/ui/properties_object.py +++ b/release/scripts/ui/properties_object.py @@ -176,23 +176,23 @@ class OBJECT_PT_display(ObjectButtonsPanel, bpy.types.Panel): col = split.column() row = col.row() - row.prop(ob, "draw_bounds", text="Bounds") + row.prop(ob, "show_bounds", text="Bounds") sub = row.row() - sub.active = ob.draw_bounds + sub.active = ob.show_bounds sub.prop(ob, "draw_bounds_type", text="") split = layout.split() col = split.column() - col.prop(ob, "draw_name", text="Name") - col.prop(ob, "draw_axis", text="Axis") - col.prop(ob, "draw_wire", text="Wire") + col.prop(ob, "show_name", text="Name") + col.prop(ob, "show_axis", text="Axis") + col.prop(ob, "show_wire", text="Wire") col.prop(ob, "color", text="Object Color") col = split.column() - col.prop(ob, "draw_texture_space", text="Texture Space") - col.prop(ob, "x_ray", text="X-Ray") - col.prop(ob, "draw_transparent", text="Transparency") + col.prop(ob, "show_texture_space", text="Texture Space") + col.prop(ob, "show_x_ray", text="X-Ray") + col.prop(ob, "show_transparent", text="Transparency") class OBJECT_PT_duplication(ObjectButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_object_constraint.py b/release/scripts/ui/properties_object_constraint.py index b3a96841d71..49b0efe14a5 100644 --- a/release/scripts/ui/properties_object_constraint.py +++ b/release/scripts/ui/properties_object_constraint.py @@ -535,7 +535,7 @@ class ConstraintButtonsPanel(): col.prop(con, "disable_linked_collision", text="No Collision") col = split.column() - col.prop(con, "draw_pivot", text="Display Pivot") + col.prop(con, "show_pivot", text="Display Pivot") split = layout.split() diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index ee550f42a5e..571f925a064 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -692,7 +692,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): sub.prop(part, "emitter") sub.prop(part, "parent") sub = split.column() - sub.prop(part, "unborn") + sub.prop(part, "show_unborn") sub.prop(part, "died") row = layout.row() @@ -866,18 +866,18 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, bpy.types.Panel): col = row.column() col.prop(part, "show_size") col.prop(part, "velocity") - col.prop(part, "num") + col.prop(part, "show_number") if part.physics_type == 'BOIDS': - col.prop(part, "draw_health") + col.prop(part, "show_health") col = row.column() - col.prop(part, "material_color", text="Use material color") + col.prop(part, "show_material_color", text="Use material color") if (path): col.prop(part, "draw_step") else: sub = col.column() - sub.active = (part.material_color is False) + sub.active = (part.show_material_color is False) #sub.label(text="color") #sub.label(text="Override material color") diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py index 0755b9be603..b7e5e0f8144 100644 --- a/release/scripts/ui/properties_physics_cloth.py +++ b/release/scripts/ui/properties_physics_cloth.py @@ -68,7 +68,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, bpy.types.Panel): row = split.row(align=True) row.prop(md, "render", text="") - row.prop(md, "realtime", text="") + row.prop(md, "show_viewport", text="") else: # add modifier split.operator("object.modifier_add", text="Add").type = 'CLOTH' diff --git a/release/scripts/ui/properties_physics_field.py b/release/scripts/ui/properties_physics_field.py index b67232f888d..14f1a570d14 100644 --- a/release/scripts/ui/properties_physics_field.py +++ b/release/scripts/ui/properties_physics_field.py @@ -181,7 +181,7 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, bpy.types.Panel): #row = split.row(align=True) #row.prop(md, "render", text="") - #row.prop(md, "realtime", text="") + #row.prop(md, "show_viewport", text="") coll = md.settings diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py index 2c25270eb39..71906f9ad3c 100644 --- a/release/scripts/ui/properties_physics_fluid.py +++ b/release/scripts/ui/properties_physics_fluid.py @@ -49,7 +49,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): row = split.row(align=True) row.prop(md, "render", text="") - row.prop(md, "realtime", text="") + row.prop(md, "show_viewport", text="") fluid = md.settings @@ -166,7 +166,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col.label(text="Type:") col.prop(fluid, "drops") col.prop(fluid, "floats") - col.prop(fluid, "tracer") + col.prop(fluid, "show_tracer") layout.prop(fluid, "path", text="") diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py index 3538b88afcf..4b9d66aa0fd 100644 --- a/release/scripts/ui/properties_physics_smoke.py +++ b/release/scripts/ui/properties_physics_smoke.py @@ -54,7 +54,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel): row = split.row(align=True) row.prop(md, "render", text="") - row.prop(md, "realtime", text="") + row.prop(md, "show_viewport", text="") else: # add modifier @@ -195,7 +195,7 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, bpy.types.Panel): col.label(text="Resolution:") col.prop(md, "amplify", text="Divisions") col.prop(md, "smoothemitter") - col.prop(md, "viewhighres") + col.prop(md, "show_high_resolution") col = split.column() col.label(text="Noise Method:") diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py index 5240e6477d8..dd65899337a 100644 --- a/release/scripts/ui/properties_physics_softbody.py +++ b/release/scripts/ui/properties_physics_softbody.py @@ -60,7 +60,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel, bpy.types.Panel): row = split.row(align=True) row.prop(md, "render", text="") - row.prop(md, "realtime", text="") + row.prop(md, "show_viewport", text="") else: # add modifier split.operator("object.modifier_add", text="Add").type = 'SOFT_BODY' diff --git a/release/scripts/ui/space_dopesheet.py b/release/scripts/ui/space_dopesheet.py index 71f7490c209..110ddd9606b 100644 --- a/release/scripts/ui/space_dopesheet.py +++ b/release/scripts/ui/space_dopesheet.py @@ -48,7 +48,7 @@ class DOPESHEET_HT_header(bpy.types.Header): sub.menu("DOPESHEET_MT_key") layout.prop(st, "mode", text="") - layout.prop(st.dopesheet, "display_summary", text="Summary") + layout.prop(st.dopesheet, "show_summary", text="Summary") if st.mode == 'DOPESHEET': layout.template_dopesheet_filter(st.dopesheet) diff --git a/release/scripts/ui/space_filebrowser.py b/release/scripts/ui/space_filebrowser.py index a67bffc37c5..d38acc1e583 100644 --- a/release/scripts/ui/space_filebrowser.py +++ b/release/scripts/ui/space_filebrowser.py @@ -49,7 +49,7 @@ class FILEBROWSER_HT_header(bpy.types.Header): layout.prop(params, "display", expand=True, text="") layout.prop(params, "sort", expand=True, text="") - layout.prop(params, "hide_dot", text="Hide Invisible") + layout.prop(params, "show_hidden", text="Hide Invisible") layout.prop(params, "do_filter", text="", icon='FILTER') row = layout.row(align=True) diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index 0e6c3922685..ad0d881d77a 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -50,7 +50,7 @@ class IMAGE_MT_view(bpy.types.Menu): layout.prop(sima, "use_realtime_update") if show_uvedit: - layout.prop(toolsettings, "uv_local_view") # Numpad / + layout.prop(toolsettings, "show_uv_local_view") # Numpad / layout.prop(uv, "show_other_objects") layout.separator() @@ -547,8 +547,8 @@ class IMAGE_PT_view_properties(bpy.types.Panel): col = split.column() col.prop(uvedit, "show_smooth_edges", text="Smooth") col.prop(uvedit, "show_modified_edges", text="Modified") - #col.prop(uvedit, "draw_edges") - #col.prop(uvedit, "draw_faces") + #col.prop(uvedit, "show_edges") + #col.prop(uvedit, "show_faces") col = split.column() col.prop(uvedit, "show_stretch", text="Stretch") diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index db9e4df8967..1206bfdef00 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -48,7 +48,7 @@ class INFO_HT_header(bpy.types.Header): sub.menu("INFO_MT_render") sub.menu("INFO_MT_help") - if window.screen.fullscreen: + if window.screen.show_fullscreen: layout.operator("screen.back_to_previous", icon='SCREEN_BACK', text="Back to Previous") layout.separator() else: diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 7e2e5bd58b3..39a8fe40e94 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -971,7 +971,7 @@ class USERPREF_PT_addons(bpy.types.Panel): colsub = box.column() row = colsub.row() - row.operator("wm.addon_expand", icon='TRIA_DOWN' if info["expanded"] else 'TRIA_RIGHT', emboss=False).module = module_name + row.operator("wm.addon_expand", icon='TRIA_DOWN' if info["show_expanded"] else 'TRIA_RIGHT', emboss=False).module = module_name rowsub = row.row() rowsub.active = is_enabled @@ -983,7 +983,7 @@ class USERPREF_PT_addons(bpy.types.Panel): row.operator("wm.addon_enable", icon='CHECKBOX_DEHLT', text="", emboss=False).module = module_name # Expanded UI (only if additional infos are available) - if info["expanded"]: + if info["show_expanded"]: if info["description"]: split = colsub.row().split(percentage=0.15) split.label(text='Description:') @@ -1040,7 +1040,7 @@ class USERPREF_PT_addons(bpy.types.Panel): from bpy.props import * -def addon_info_get(mod, info_basis={"name": "", "author": "", "version": "", "blender": "", "location": "", "description": "", "wiki_url": "", "tracker_url": "", "category": "", "warning": "", "expanded": False}): +def addon_info_get(mod, info_basis={"name": "", "author": "", "version": "", "blender": "", "location": "", "description": "", "wiki_url": "", "tracker_url": "", "category": "", "warning": "", "show_expanded": False}): addon_info = getattr(mod, "bl_addon_info", {}) # avoid re-initializing @@ -1209,7 +1209,7 @@ class WM_OT_addon_expand(bpy.types.Operator): return {'CANCELLED'} info = addon_info_get(mod) - info["expanded"] = not info["expanded"] + info["show_expanded"] = not info["show_expanded"] return {'FINISHED'} diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py index ed245d2ee91..4acfacee098 100644 --- a/release/scripts/ui/space_userpref_keymap.py +++ b/release/scripts/ui/space_userpref_keymap.py @@ -167,7 +167,7 @@ class InputKeyMapPanel(bpy.types.Panel): col = self.indented_layout(layout, level) row = col.row() - row.prop(km, "children_expanded", text="", emboss=False) + row.prop(km, "show_expanded_children", text="", emboss=False) row.label(text=km.name) row.label() @@ -180,19 +180,19 @@ class InputKeyMapPanel(bpy.types.Panel): else: op = row.operator("wm.keymap_edit", text="Edit") - if km.children_expanded: + if km.show_expanded_children: if children: # Put the Parent key map's entries in a 'global' sub-category # equal in hierarchy to the other children categories subcol = self.indented_layout(col, level + 1) subrow = subcol.row() - subrow.prop(km, "items_expanded", text="", emboss=False) + subrow.prop(km, "show_expanded_items", text="", emboss=False) subrow.label(text="%s (Global)" % km.name) else: - km.items_expanded = True + km.show_expanded_items = True # Key Map items - if km.items_expanded: + if km.show_expanded_items: for kmi in km.items: self.draw_kmi(display_keymaps, kc, km, kmi, col, level + 1) @@ -227,7 +227,7 @@ class InputKeyMapPanel(bpy.types.Panel): # header bar row = split.row() - row.prop(kmi, "expanded", text="", emboss=False) + row.prop(kmi, "show_expanded", text="", emboss=False) row = split.row() row.enabled = km.user_defined @@ -261,7 +261,7 @@ class InputKeyMapPanel(bpy.types.Panel): op.item_id = kmi.id # Expanded, additional event settings - if kmi.expanded: + if kmi.show_expanded: box = col.box() box.enabled = km.user_defined @@ -741,8 +741,8 @@ class WM_OT_keyitem_add(bpy.types.Operator): # clear filter and expand keymap so we can see the newly added item if context.space_data.filter_text != "": context.space_data.filter_text = "" - km.items_expanded = True - km.children_expanded = True + km.show_expanded_items = True + km.show_expanded_children = True return {'FINISHED'} diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 6dd7cc5187c..98f8e9a90ab 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -2026,7 +2026,7 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): col.prop(view, "show_relationship_lines") if ob and ob.type == 'MESH': mesh = ob.data - col.prop(mesh, "all_edges") + col.prop(mesh, "show_all_edges") col = layout.column() col.active = display_all @@ -2060,9 +2060,9 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): col.prop(region, "lock_rotation") row = col.row() row.enabled = region.lock_rotation - row.prop(region, "box_preview") + row.prop(region, "show_sync_view") row = col.row() - row.enabled = region.lock_rotation and region.box_preview + row.enabled = region.lock_rotation and region.show_sync_view row.prop(region, "box_clip") @@ -2083,24 +2083,24 @@ class VIEW3D_PT_view3d_meshdisplay(bpy.types.Panel): col = layout.column() col.label(text="Overlays:") - col.prop(mesh, "draw_edges", text="Edges") - col.prop(mesh, "draw_faces", text="Faces") - col.prop(mesh, "draw_creases", text="Creases") - col.prop(mesh, "draw_bevel_weights", text="Bevel Weights") - col.prop(mesh, "draw_seams", text="Seams") - col.prop(mesh, "draw_sharp", text="Sharp") + col.prop(mesh, "show_edges", text="Edges") + col.prop(mesh, "show_faces", text="Faces") + col.prop(mesh, "show_edge_crease", text="Creases") + col.prop(mesh, "show_edge_bevel_weight", text="Bevel Weights") + col.prop(mesh, "show_edge_seams", text="Seams") + col.prop(mesh, "show_edge_sharp", text="Sharp") col.separator() col.label(text="Normals:") - col.prop(mesh, "draw_normals", text="Face") - col.prop(mesh, "draw_vertex_normals", text="Vertex") + col.prop(mesh, "show_normal_face", text="Face") + col.prop(mesh, "show_normal_vertex", text="Vertex") col.prop(context.scene.tool_settings, "normal_size", text="Normal Size") col.separator() col.label(text="Numerics:") - col.prop(mesh, "draw_edge_length") - col.prop(mesh, "draw_edge_angle") - col.prop(mesh, "draw_face_area") + col.prop(mesh, "show_extra_edge_length") + col.prop(mesh, "show_extra_edge_angle") + col.prop(mesh, "show_extra_face_area") class VIEW3D_PT_view3d_curvedisplay(bpy.types.Panel): @@ -2120,8 +2120,8 @@ class VIEW3D_PT_view3d_curvedisplay(bpy.types.Panel): col = layout.column() col.label(text="Overlays:") - col.prop(curve, "draw_handles", text="Handles") - col.prop(curve, "draw_normals", text="Normals") + col.prop(curve, "show_handles", text="Handles") + col.prop(curve, "show_normal_face", text="Normals") col.prop(context.scene.tool_settings, "normal_size", text="Normal Size") diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index 8981369f3b0..91355ba42b6 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -999,7 +999,7 @@ class VIEW3D_PT_sculpt_options(PaintPanel, bpy.types.Panel): col = split.column() col.prop(sculpt, "use_openmp", text="Threaded Sculpt") - col.prop(sculpt, "fast_navigate") + col.prop(sculpt, "show_low_resolution") col.prop(sculpt, "show_brush") col.label(text="Unified Settings:") @@ -1339,10 +1339,10 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, bpy.types.Panel): col.label(text="Draw:") col.prop(pe, "draw_step", text="Path Steps") if pe.hair: - col.prop(pe, "draw_particles", text="Children") + col.prop(pe, "show_particles", text="Children") else: if pe.type == 'PARTICLES': - col.prop(pe, "draw_particles", text="Particles") + col.prop(pe, "show_particles", text="Particles") col.prop(pe, "fade_time") sub = col.row() sub.active = pe.fade_time -- cgit v1.2.3