[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31432] trunk/blender: apply rna naming for ToolSettings
Campbell Barton
ideasman42 at gmail.com
Wed Aug 18 05:24:53 CEST 2010
Revision: 31432
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31432
Author: campbellbarton
Date: 2010-08-18 05:24:52 +0200 (Wed, 18 Aug 2010)
Log Message:
-----------
apply rna naming for ToolSettings
Modified Paths:
--------------
trunk/blender/release/scripts/presets/interaction/maya.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_time.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt
Modified: trunk/blender/release/scripts/presets/interaction/maya.py
===================================================================
--- trunk/blender/release/scripts/presets/interaction/maya.py 2010-08-18 03:05:14 UTC (rev 31431)
+++ trunk/blender/release/scripts/presets/interaction/maya.py 2010-08-18 03:24:52 UTC (rev 31432)
@@ -212,9 +212,9 @@
km = kc.add_keymap('Object Mode', space_type='EMPTY', region_type='WINDOW', modal=False)
kmi = km.items.add('wm.context_cycle_enum', 'O', 'PRESS', shift=True)
-kmi.properties.data_path = 'tool_settings.proportional_editing_falloff'
+kmi.properties.data_path = 'tool_settings.proportional_edit_falloff'
kmi = km.items.add('wm.context_toggle_enum', 'O', 'PRESS')
-kmi.properties.data_path = 'tool_settings.proportional_editing'
+kmi.properties.data_path = 'tool_settings.proportional_edit'
kmi.properties.value_1 = 'DISABLED'
kmi.properties.value_2 = 'ENABLED'
kmi = km.items.add('view3d.game_start', 'P', 'PRESS')
@@ -363,13 +363,13 @@
kmi = km.items.add('wm.call_menu', 'G', 'PRESS', ctrl=True)
kmi.properties.name = 'VIEW3D_MT_vertex_group'
kmi = km.items.add('wm.context_cycle_enum', 'O', 'PRESS', shift=True)
-kmi.properties.data_path = 'tool_settings.proportional_editing_falloff'
+kmi.properties.data_path = 'tool_settings.proportional_edit_falloff'
kmi = km.items.add('wm.context_toggle_enum', 'O', 'PRESS')
-kmi.properties.data_path = 'tool_settings.proportional_editing'
+kmi.properties.data_path = 'tool_settings.proportional_edit'
kmi.properties.value_1 = 'DISABLED'
kmi.properties.value_2 = 'ENABLED'
kmi = km.items.add('wm.context_toggle_enum', 'O', 'PRESS', alt=True)
-kmi.properties.data_path = 'tool_settings.proportional_editing'
+kmi.properties.data_path = 'tool_settings.proportional_edit'
kmi.properties.value_1 = 'DISABLED'
kmi.properties.value_2 = 'CONNECTED'
kmi = km.items.add('mesh.select_all', 'SELECTMOUSE', 'CLICK')
Modified: trunk/blender/release/scripts/ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/ui/space_image.py 2010-08-18 03:05:14 UTC (rev 31431)
+++ trunk/blender/release/scripts/ui/space_image.py 2010-08-18 03:24:52 UTC (rev 31432)
@@ -244,8 +244,8 @@
layout.separator()
- layout.prop_menu_enum(toolsettings, "proportional_editing")
- layout.prop_menu_enum(toolsettings, "proportional_editing_falloff")
+ layout.prop_menu_enum(toolsettings, "proportional_edit")
+ layout.prop_menu_enum(toolsettings, "proportional_edit_falloff")
layout.separator()
@@ -295,21 +295,21 @@
uvedit = sima.uv_editor
layout.prop(uvedit, "pivot_point", text="", icon_only=True)
- layout.prop(toolsettings, "uv_sync_selection", text="")
+ layout.prop(toolsettings, "use_uv_select_sync", text="")
- if toolsettings.uv_sync_selection:
+ if toolsettings.use_uv_select_sync:
row = layout.row(align=True)
- row.prop(toolsettings, "mesh_selection_mode", text="", index=0, icon='VERTEXSEL')
- row.prop(toolsettings, "mesh_selection_mode", text="", index=1, icon='EDGESEL')
- row.prop(toolsettings, "mesh_selection_mode", text="", index=2, icon='FACESEL')
+ row.prop(toolsettings, "mesh_select_mode", text="", index=0, icon='VERTEXSEL')
+ row.prop(toolsettings, "mesh_select_mode", text="", index=1, icon='EDGESEL')
+ row.prop(toolsettings, "mesh_select_mode", text="", index=2, icon='FACESEL')
else:
- layout.prop(toolsettings, "uv_selection_mode", text="", expand=True)
+ layout.prop(toolsettings, "uv_select_mode", text="", expand=True)
layout.prop(uvedit, "sticky_select_mode", text="", icon_only=True)
row = layout.row(align=True)
- row.prop(toolsettings, "proportional_editing", text="", icon_only=True)
- if toolsettings.proportional_editing != 'DISABLED':
- row.prop(toolsettings, "proportional_editing_falloff", text="", icon_only=True)
+ row.prop(toolsettings, "proportional_edit", text="", icon_only=True)
+ if toolsettings.proportional_edit != 'DISABLED':
+ row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
row = layout.row(align=True)
row.prop(toolsettings, "snap", text="")
Modified: trunk/blender/release/scripts/ui/space_time.py
===================================================================
--- trunk/blender/release/scripts/ui/space_time.py 2010-08-18 03:05:14 UTC (rev 31431)
+++ trunk/blender/release/scripts/ui/space_time.py 2010-08-18 03:24:52 UTC (rev 31432)
@@ -67,10 +67,10 @@
row.operator("screen.frame_jump", text="", icon='FF').end = True
row = layout.row(align=True)
- row.prop(tools, "use_auto_keying", text="", toggle=True)
- if screen.animation_playing and tools.use_auto_keying:
+ row.prop(tools, "use_keyframe_insert_auto", text="", toggle=True)
+ if screen.animation_playing and tools.use_keyframe_insert_auto:
subsub = row.row()
- subsub.prop(tools, "record_with_nla", toggle=True)
+ subsub.prop(tools, "use_record_with_nla", toggle=True)
layout.prop(scene, "sync_mode", text="")
@@ -189,8 +189,8 @@
layout = self.layout
tools = context.tool_settings
- layout.prop_enum(tools, "autokey_mode", 'ADD_REPLACE_KEYS')
- layout.prop_enum(tools, "autokey_mode", 'REPLACE_KEYS')
+ layout.prop_enum(tools, "auto_keying_mode", 'ADD_REPLACE_KEYS')
+ layout.prop_enum(tools, "auto_keying_mode", 'REPLACE_KEYS')
def register():
pass
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-08-18 03:05:14 UTC (rev 31431)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-08-18 03:24:52 UTC (rev 31432)
@@ -299,7 +299,7 @@
sub = col.column()
- # sub.active = edit.use_auto_keying # incorrect, timeline can enable
+ # sub.active = edit.use_keyframe_insert_auto # incorrect, timeline can enable
sub.prop(edit, "use_keyframe_insert_keyingset", text="Only Insert for Keying Set")
sub.prop(edit, "use_keyframe_insert_available", text="Only Insert Available")
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2010-08-18 03:05:14 UTC (rev 31431)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2010-08-18 03:24:52 UTC (rev 31432)
@@ -60,9 +60,9 @@
'''
if obj and obj.mode == 'EDIT' and obj.type == 'MESH':
row_sub = row.row(align=True)
- row_sub.prop(toolsettings, "mesh_selection_mode", text="", index=0, icon='VERTEXSEL')
- row_sub.prop(toolsettings, "mesh_selection_mode", text="", index=1, icon='EDGESEL')
- row_sub.prop(toolsettings, "mesh_selection_mode", text="", index=2, icon='FACESEL')
+ row_sub.prop(toolsettings, "mesh_select_mode", text="", index=0, icon='VERTEXSEL')
+ row_sub.prop(toolsettings, "mesh_select_mode", text="", index=1, icon='EDGESEL')
+ row_sub.prop(toolsettings, "mesh_select_mode", text="", index=2, icon='FACESEL')
'''
if obj:
@@ -77,14 +77,14 @@
# Proportional editing
if obj.mode in ('EDIT', 'PARTICLE_EDIT'):
row = layout.row(align=True)
- row.prop(toolsettings, "proportional_editing", text="", icon_only=True)
- if toolsettings.proportional_editing != 'DISABLED':
- row.prop(toolsettings, "proportional_editing_falloff", text="", icon_only=True)
+ row.prop(toolsettings, "proportional_edit", text="", icon_only=True)
+ if toolsettings.proportional_edit != 'DISABLED':
+ row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
elif obj.mode == 'OBJECT':
row = layout.row(align=True)
- row.prop(toolsettings, "proportional_editing_objects", text="", icon_only=True)
- if toolsettings.proportional_editing_objects:
- row.prop(toolsettings, "proportional_editing_falloff", text="", icon_only=True)
+ row.prop(toolsettings, "use_proportional_edit_objects", text="", icon_only=True)
+ if toolsettings.use_proportional_edit_objects:
+ row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
# Snap
row = layout.row(align=True)
@@ -93,11 +93,11 @@
if toolsettings.snap_element != 'INCREMENT':
row.prop(toolsettings, "snap_target", text="")
if obj and obj.mode == 'OBJECT':
- row.prop(toolsettings, "snap_align_rotation", text="")
+ row.prop(toolsettings, "use_snap_align_rotation", text="")
if toolsettings.snap_element == 'VOLUME':
- row.prop(toolsettings, "snap_peel_object", text="")
+ row.prop(toolsettings, "use_snap_peel_object", text="")
elif toolsettings.snap_element == 'FACE':
- row.prop(toolsettings, "snap_project", text="")
+ row.prop(toolsettings, "use_snap_project", text="")
# OpenGL render
row = layout.row(align=True)
@@ -489,7 +489,7 @@
layout.operator("mesh.select_by_number_vertices", text="Triangles").type = 'TRIANGLES'
layout.operator("mesh.select_by_number_vertices", text="Quads").type = 'QUADS'
- if context.scene.tool_settings.mesh_selection_mode[2] == False:
+ if context.scene.tool_settings.mesh_select_mode[2] == False:
layout.operator("mesh.select_non_manifold", text="Non Manifold")
layout.operator("mesh.select_by_number_vertices", text="Loose Verts/Edges").type = 'OTHER'
layout.operator("mesh.select_similar", text="Similar")
@@ -1296,9 +1296,9 @@
layout.separator()
- layout.prop(settings, "automerge_editing")
- layout.prop_menu_enum(settings, "proportional_editing")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list