[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31416] trunk/blender: apply UserPrefs and Theme rna naming changes.

Campbell Barton ideasman42 at gmail.com
Tue Aug 17 15:14:41 CEST 2010


Revision: 31416
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31416
Author:   campbellbarton
Date:     2010-08-17 15:14:41 +0200 (Tue, 17 Aug 2010)

Log Message:
-----------
apply UserPrefs and Theme rna naming changes.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/add_object_utils.py
    trunk/blender/release/scripts/modules/bpy/utils.py
    trunk/blender/release/scripts/modules/rigify/__init__.py
    trunk/blender/release/scripts/op/presets.py
    trunk/blender/release/scripts/presets/interaction/blender.py
    trunk/blender/release/scripts/presets/interaction/maya.py
    trunk/blender/release/scripts/ui/properties_scene.py
    trunk/blender/release/scripts/ui/space_text.py
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/editors/space_view3d/view3d_header.c
    trunk/blender/source/blender/makesrna/intern/rna_animation.c
    trunk/blender/source/blender/makesrna/intern/rna_color.c
    trunk/blender/source/blender/makesrna/intern/rna_material.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/makesrna/intern/rna_text.c
    trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/blender/python/doc/sphinx_doc_gen.py

Modified: trunk/blender/release/scripts/modules/add_object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/add_object_utils.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/modules/add_object_utils.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -77,7 +77,7 @@
         bpy.ops.object.mode_set(mode='EDIT')
     else:
         scene.objects.active = obj_new
-        if context.user_preferences.edit.enter_edit_mode:
+        if context.user_preferences.edit.use_enter_edit_mode:
             bpy.ops.object.mode_set(mode='EDIT')
 
     return base

Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/modules/bpy/utils.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -224,7 +224,7 @@
 
 
 def user_script_path():
-    path = _bpy.context.user_preferences.filepaths.python_scripts_directory
+    path = _bpy.context.user_preferences.filepaths.script_directory
 
     if path:
         path = _os.path.normpath(path)
@@ -243,7 +243,7 @@
 
     # add user scripts dir
     if user:
-        user_script_path = _bpy.context.user_preferences.filepaths.python_scripts_directory
+        user_script_path = _bpy.context.user_preferences.filepaths.script_directory
     else:
         user_script_path = None
 

Modified: trunk/blender/release/scripts/modules/rigify/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/__init__.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/modules/rigify/__init__.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -159,8 +159,8 @@
     # Not needed but catches any errors before duplicating
     validate_rig(context, obj_orig)
 
-    global_undo = context.user_preferences.edit.global_undo
-    context.user_preferences.edit.global_undo = False
+    use_global_undo = context.user_preferences.edit.use_global_undo
+    context.user_preferences.edit.use_global_undo = False
     mode_orig = context.mode
     rest_backup = obj_orig.data.pose_position
     obj_orig.data.pose_position = 'REST'
@@ -471,7 +471,7 @@
     obj_orig.data.pose_position = rest_backup
     obj.data.pose_position = 'POSE'
     obj_orig.data.pose_position = 'POSE'
-    context.user_preferences.edit.global_undo = global_undo
+    context.user_preferences.edit.use_global_undo = use_global_undo
 
     print("Done.\n")
 

Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/op/presets.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -189,16 +189,16 @@
     save_keyconfig = True
 
     preset_values = [
-        "bpy.context.user_preferences.edit.drag_immediately",
-        "bpy.context.user_preferences.edit.insertkey_xyz_to_rgb",
+        "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.zoom_style",
-        "bpy.context.user_preferences.inputs.zoom_axis",
-        "bpy.context.user_preferences.inputs.view_rotation",
-        "bpy.context.user_preferences.inputs.invert_zoom_direction",
-        "bpy.context.user_preferences.inputs.emulate_numpad",
-        "bpy.context.user_preferences.inputs.emulate_3_button_mouse",
-        "bpy.context.user_preferences.inputs.continuous_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.use_emulate_numpad",
+        "bpy.context.user_preferences.inputs.use_mouse_emulate_3_button",
+        "bpy.context.user_preferences.inputs.use_mouse_continuous",
     ]
 
     preset_subdir = "interaction"

Modified: trunk/blender/release/scripts/presets/interaction/blender.py
===================================================================
--- trunk/blender/release/scripts/presets/interaction/blender.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/presets/interaction/blender.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -4,13 +4,13 @@
 wm = bpy.context.manager
 wm.active_keyconfig = wm.keyconfigs['Blender']
 
-bpy.context.user_preferences.view.auto_depth = False
-bpy.context.user_preferences.view.zoom_to_mouse = False
-bpy.context.user_preferences.view.rotate_around_selection = False
-bpy.context.user_preferences.edit.drag_immediately = False
-bpy.context.user_preferences.edit.insertkey_xyz_to_rgb = False
+bpy.context.user_preferences.view.use_mouse_auto_depth = False
+bpy.context.user_preferences.view.use_zoom_to_mouse = False
+bpy.context.user_preferences.view.use_rotate_around_active = False
+bpy.context.user_preferences.edit.use_drag_immediately = False
+bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False
 bpy.context.user_preferences.inputs.select_mouse = 'RIGHT'
-bpy.context.user_preferences.inputs.zoom_style = 'DOLLY'
-bpy.context.user_preferences.inputs.zoom_axis = 'VERTICAL'
-bpy.context.user_preferences.inputs.view_rotation = 'TRACKBALL'
-bpy.context.user_preferences.inputs.invert_zoom_direction = False
+bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
+bpy.context.user_preferences.inputs.view_zoom_axis = 'VERTICAL'
+bpy.context.user_preferences.inputs.view_rotate_method = 'TRACKBALL'
+bpy.context.user_preferences.inputs.invert_mouse_wheel_zoom = False

Modified: trunk/blender/release/scripts/presets/interaction/maya.py
===================================================================
--- trunk/blender/release/scripts/presets/interaction/maya.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/presets/interaction/maya.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -7,7 +7,7 @@
 # Map 3D View
 km = kc.add_keymap('3D View', space_type='VIEW_3D', region_type='WINDOW', modal=False)
 
-kmi = km.items.add('view3d.use_manipulator', 'LEFTMOUSE', 'PRESS', any=True)
+kmi = km.items.add('view3d.show_manipulator', 'LEFTMOUSE', 'PRESS', any=True)
 kmi.properties.release_confirm = True
 kmi = km.items.add('view3d.cursor3d', 'ACTIONMOUSE', 'PRESS')
 kmi = km.items.add('view3d.rotate', 'LEFTMOUSE', 'PRESS', alt=True)
@@ -175,7 +175,7 @@
 kmi = km.items.add('wm.context_toggle', 'COMMA', 'PRESS', alt=True)
 kmi.properties.data_path = 'space_data.use_pivot_point_align'
 kmi = km.items.add('wm.context_toggle', 'Q', 'PRESS')
-kmi.properties.data_path = 'space_data.use_manipulator'
+kmi.properties.data_path = 'space_data.show_manipulator'
 kmi = km.items.add('wm.context_set_enum', 'PERIOD', 'PRESS')
 kmi.properties.data_path = 'space_data.pivot_point'
 kmi.properties.value = 'CURSOR'
@@ -377,10 +377,10 @@
 
 wm.active_keyconfig = kc
 
-bpy.context.user_preferences.edit.drag_immediately = True
-bpy.context.user_preferences.edit.insertkey_xyz_to_rgb = False
+bpy.context.user_preferences.edit.use_drag_immediately = True
+bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb = False
 bpy.context.user_preferences.inputs.select_mouse = 'LEFT'
-bpy.context.user_preferences.inputs.zoom_style = 'DOLLY'
-bpy.context.user_preferences.inputs.zoom_axis = 'HORIZONTAL'
-bpy.context.user_preferences.inputs.view_rotation = 'TURNTABLE'
-bpy.context.user_preferences.inputs.invert_zoom_direction = True
+bpy.context.user_preferences.inputs.view_zoom_method = 'DOLLY'
+bpy.context.user_preferences.inputs.view_zoom_axis = 'HORIZONTAL'
+bpy.context.user_preferences.inputs.view_rotate_method = 'TURNTABLE'
+bpy.context.user_preferences.inputs.invert_mouse_wheel_zoom = True

Modified: trunk/blender/release/scripts/ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_scene.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/ui/properties_scene.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -98,7 +98,7 @@
             col.label(text="Keyframing Settings:")
             col.prop(ks, "insertkey_needed", text="Needed")
             col.prop(ks, "insertkey_visual", text="Visual")
-            col.prop(ks, "insertkey_xyz_to_rgb", text="XYZ to RGB")
+            col.prop(ks, "use_insertkey_xyz_to_rgb", text="XYZ to RGB")
 
 
 class SCENE_PT_keying_set_paths(SceneButtonsPanel, bpy.types.Panel):
@@ -151,7 +151,7 @@
             col.label(text="Keyframing Settings:")
             col.prop(ksp, "insertkey_needed", text="Needed")
             col.prop(ksp, "insertkey_visual", text="Visual")
-            col.prop(ksp, "insertkey_xyz_to_rgb", text="XYZ to RGB")
+            col.prop(ksp, "use_insertkey_xyz_to_rgb", text="XYZ to RGB")
 
 
 class SCENE_PT_physics(SceneButtonsPanel, bpy.types.Panel):
@@ -245,7 +245,7 @@
 
         f.write("ks.insertkey_needed = %s\n" % ks.insertkey_needed)
         f.write("ks.insertkey_visual = %s\n" % ks.insertkey_visual)
-        f.write("ks.insertkey_xyz_to_rgb = %s\n" % ks.insertkey_xyz_to_rgb)
+        f.write("ks.use_insertkey_xyz_to_rgb = %s\n" % ks.use_insertkey_xyz_to_rgb)
         f.write("\n")
 
 

Modified: trunk/blender/release/scripts/ui/space_text.py
===================================================================
--- trunk/blender/release/scripts/ui/space_text.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/ui/space_text.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -93,7 +93,7 @@
 
         text = st.text
         if text:
-            flow.prop(text, "tabs_as_spaces")
+            flow.prop(text, "use_tabs_as_spaces")
 
 
 class TEXT_PT_find(bpy.types.Panel):

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-08-17 13:12:58 UTC (rev 31415)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-08-17 13:14:41 UTC (rev 31416)
@@ -45,9 +45,9 @@
     colsub = padding.column()
     colsub.row().prop(context, "text")

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list