diff options
| -rw-r--r-- | release/scripts/modules/add_object_utils.py | 2 | ||||
| -rw-r--r-- | release/scripts/modules/bpy/utils.py | 4 | ||||
| -rw-r--r-- | release/scripts/modules/rigify/__init__.py | 6 | ||||
| -rw-r--r-- | release/scripts/op/presets.py | 18 | ||||
| -rw-r--r-- | release/scripts/presets/interaction/blender.py | 18 | ||||
| -rw-r--r-- | release/scripts/presets/interaction/maya.py | 16 | ||||
| -rw-r--r-- | release/scripts/ui/properties_scene.py | 6 | ||||
| -rw-r--r-- | release/scripts/ui/space_text.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/space_userpref.py | 136 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_text.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 150 | ||||
| -rw-r--r-- | source/blender/python/doc/sphinx_doc_gen.py | 1 |
18 files changed, 191 insertions, 186 deletions
diff --git a/release/scripts/modules/add_object_utils.py b/release/scripts/modules/add_object_utils.py index 41c05ce9d8a..eaa97512f89 100644 --- a/release/scripts/modules/add_object_utils.py +++ b/release/scripts/modules/add_object_utils.py @@ -77,7 +77,7 @@ def add_object_data(context, obdata, operator=None): 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 diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 6c1c669d1f2..7cfe476c2e7 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -224,7 +224,7 @@ _scripts = (_os.path.normpath(_scripts), ) 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 @@ def script_paths(subdir=None, user=True): # 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 diff --git a/release/scripts/modules/rigify/__init__.py b/release/scripts/modules/rigify/__init__.py index f495406e8d8..dafcc381832 100644 --- a/release/scripts/modules/rigify/__init__.py +++ b/release/scripts/modules/rigify/__init__.py @@ -159,8 +159,8 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): # 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 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): 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") diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index 2012ba913fb..529e51f6cce 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -189,16 +189,16 @@ class AddPresetInteraction(AddPresetBase, bpy.types.Operator): 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" diff --git a/release/scripts/presets/interaction/blender.py b/release/scripts/presets/interaction/blender.py index 63006b2008d..229aa657b2f 100644 --- a/release/scripts/presets/interaction/blender.py +++ b/release/scripts/presets/interaction/blender.py @@ -4,13 +4,13 @@ import bpy 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 diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/interaction/maya.py index 5758e5d841a..9052d082cad 100644 --- a/release/scripts/presets/interaction/maya.py +++ b/release/scripts/presets/interaction/maya.py @@ -7,7 +7,7 @@ kc = wm.add_keyconfig('Maya') # 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.properties.value = 'MEDIAN_POINT' 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 @@ kmi.properties.action = 'DESELECT' 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 diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py index 3afa5d2f53f..d5b2fd6e3ec 100644 --- a/release/scripts/ui/properties_scene.py +++ b/release/scripts/ui/properties_scene.py @@ -98,7 +98,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel, bpy.types.Panel): 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 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, bpy.types.Panel): 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 @@ class ANIM_OT_keying_set_export(bpy.types.Operator): 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") diff --git a/release/scripts/ui/space_text.py b/release/scripts/ui/space_text.py index 59acb66a2d3..b156b18cbbb 100644 --- a/release/scripts/ui/space_text.py +++ b/release/scripts/ui/space_text.py @@ -93,7 +93,7 @@ class TEXT_PT_properties(bpy.types.Panel): 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): diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 5f9514c5885..7e2e5bd58b3 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -45,9 +45,9 @@ def ui_items_general(col, context): colsub = padding.column() colsub.row().prop(context, "text") colsub.row().prop(context, "text_sel") - colsub.prop(context, "shaded") + colsub.prop(context, "show_shaded") subsub = colsub.column(align=True) - subsub.active = context.shaded + subsub.active = context.show_shaded subsub.prop(context, "shadetop") subsub.prop(context, "shadedown") @@ -154,12 +154,12 @@ class USERPREF_PT_interface(bpy.types.Panel): col = row.column() col.label(text="Display:") - col.prop(view, "tooltips") - col.prop(view, "display_object_info", text="Object Info") - col.prop(view, "use_large_cursors") + col.prop(view, "show_tooltips") + col.prop(view, "show_object_info", text="Object Info") + col.prop(view, "show_large_cursors") col.prop(view, "show_view_name", text="View Name") col.prop(view, "show_playback_fps", text="Playback FPS") - col.prop(view, "global_scene") + col.prop(view, "use_global_scene") col.prop(view, "object_origin_size") col.separator() @@ -178,14 +178,14 @@ class USERPREF_PT_interface(bpy.types.Panel): col = row.column() col.label(text="View Manipulation:") - col.prop(view, "auto_depth") - col.prop(view, "zoom_to_mouse") - col.prop(view, "rotate_around_selection") - col.prop(view, "global_pivot") + col.prop(view, "use_mouse_auto_depth") + col.prop(view, "use_zoom_to_mouse") + col.prop(view, "use_rotate_around_active") + col.prop(view, "use_global_pivot") col.separator() - col.prop(view, "auto_perspective") + col.prop(view, "use_auto_perspective") col.prop(view, "smooth_view") col.prop(view, "rotation_angle") @@ -193,7 +193,7 @@ class USERPREF_PT_interface(bpy.types.Panel): col.separator() col.label(text="2D Viewports:") - col.prop(view, "view2d_grid_minimum_spacing", text="Minimum Grid Spacing") + col.prop(view, "view2d_grid_spacing_min", text="Minimum Grid Spacing") col.prop(view, "timecode_style") row.separator() @@ -202,13 +202,13 @@ class USERPREF_PT_interface(bpy.types.Panel): col = row.column() #Toolbox doesn't exist yet #col.label(text="Toolbox:") - #col.prop(view, "use_column_layout") + #col.prop(view, "show_column_layout") #col.label(text="Open Toolbox Delay:") #col.prop(view, "open_left_mouse_delay", text="Hold LMB") #col.prop(view, "open_right_mouse_delay", text="Hold RMB") - col.prop(view, "use_manipulator") + col.prop(view, "show_manipulator") sub = col.column() - sub.active = view.use_manipulator + sub.active = view.show_manipulator sub.prop(view, "manipulator_size", text="Size") sub.prop(view, "manipulator_handle_size", text="Handle Size") sub.prop(view, "manipulator_hotspot", text="Hotspot") @@ -218,7 +218,7 @@ class USERPREF_PT_interface(bpy.types.Panel): col.separator() col.label(text="Menus:") - col.prop(view, "open_mouse_over") + col.prop(view, "use_mouse_over_open") col.label(text="Menu Open Delay:") col.prop(view, "open_toplevel_delay", text="Top Level") col.prop(view, "open_sublevel_delay", text="Sub Level") @@ -256,7 +256,7 @@ class USERPREF_PT_edit(bpy.types.Panel): col.separator() col.label(text="New Objects:") - col.prop(edit, "enter_edit_mode") + col.prop(edit, "use_enter_edit_mode") col.label(text="Align To:") col.prop(edit, "object_align", text="") @@ -265,7 +265,7 @@ class USERPREF_PT_edit(bpy.types.Panel): col.separator() col.label(text="Undo:") - col.prop(edit, "global_undo") + col.prop(edit, "use_global_undo") col.prop(edit, "undo_steps", text="Steps") col.prop(edit, "undo_memory_limit", text="Memory Limit") @@ -276,9 +276,9 @@ class USERPREF_PT_edit(bpy.types.Panel): col.label(text="Grease Pencil:") col.prop(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance") col.prop(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance") - #col.prop(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke") + #col.prop(edit, "use_grease_pencil_simplify_stroke", text="Simplify Stroke") col.prop(edit, "grease_pencil_eraser_radius", text="Eraser Radius") - col.prop(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke") + col.prop(edit, "use_grease_pencil_smooth_stroke", text="Smooth Stroke") col.separator() col.separator() col.separator() @@ -291,7 +291,7 @@ class USERPREF_PT_edit(bpy.types.Panel): col = row.column() col.label(text="Keyframing:") col.prop(edit, "use_visual_keying") - col.prop(edit, "keyframe_insert_needed", text="Only Insert Needed") + col.prop(edit, "use_keyframe_insert_needed", text="Only Insert Needed") col.separator() @@ -300,47 +300,47 @@ class USERPREF_PT_edit(bpy.types.Panel): sub = col.column() # sub.active = edit.use_auto_keying # incorrect, timeline can enable - sub.prop(edit, "auto_keyframe_insert_keyingset", text="Only Insert for Keying Set") - sub.prop(edit, "auto_keyframe_insert_available", text="Only Insert Available") + sub.prop(edit, "use_keyframe_insert_keyingset", text="Only Insert for Keying Set") + sub.prop(edit, "use_keyframe_insert_available", text="Only Insert Available") col.separator() col.label(text="New F-Curve Defaults:") col.prop(edit, "keyframe_new_interpolation_type", text="Interpolation") col.prop(edit, "keyframe_new_handle_type", text="Handles") - col.prop(edit, "insertkey_xyz_to_rgb", text="XYZ to RGB") + col.prop(edit, "use_insertkey_xyz_to_rgb", text="XYZ to RGB") col.separator() col.separator() col.separator() col.label(text="Transform:") - col.prop(edit, "drag_immediately") + col.prop(edit, "use_drag_immediately") row.separator() row.separator() col = row.column() row = col.row(align=True) - row.prop(edit, "sculpt_paint_overlay_col", text="Sculpt Overlay Color") + row.prop(edit, "sculpt_paint_overlay_color", text="Sculpt Overlay Color") col.separator() col.separator() col.separator() col.label(text="Duplicate Data:") - col.prop(edit, "duplicate_mesh", text="Mesh") - col.prop(edit, "duplicate_surface", text="Surface") - col.prop(edit, "duplicate_curve", text="Curve") - col.prop(edit, "duplicate_text", text="Text") - col.prop(edit, "duplicate_metaball", text="Metaball") - col.prop(edit, "duplicate_armature", text="Armature") - col.prop(edit, "duplicate_lamp", text="Lamp") - col.prop(edit, "duplicate_material", text="Material") - col.prop(edit, "duplicate_texture", text="Texture") - #col.prop(edit, "duplicate_fcurve", text="F-Curve") - col.prop(edit, "duplicate_action", text="Action") - col.prop(edit, "duplicate_particle", text="Particle") + col.prop(edit, "use_duplicate_mesh", text="Mesh") + col.prop(edit, "use_duplicate_surface", text="Surface") + col.prop(edit, "use_duplicate_curve", text="Curve") + col.prop(edit, "use_duplicate_text", text="Text") + col.prop(edit, "use_duplicate_metaball", text="Metaball") + col.prop(edit, "use_duplicate_armature", text="Armature") + col.prop(edit, "use_duplicate_lamp", text="Lamp") + col.prop(edit, "use_duplicate_material", text="Material") + col.prop(edit, "use_duplicate_texture", text="Texture") + #col.prop(edit, "use_duplicate_fcurve", text="F-Curve") + col.prop(edit, "use_duplicate_action", text="Action") + col.prop(edit, "use_duplicate_particle", text="Particle") class USERPREF_PT_system(bpy.types.Panel): @@ -372,8 +372,8 @@ class USERPREF_PT_system(bpy.types.Panel): col.prop(system, "dpi") col.prop(system, "frame_server_port") col.prop(system, "scrollback", text="Console Scrollback") - col.prop(system, "auto_execute_scripts") - col.prop(system, "tabs_as_spaces") + col.prop(system, "use_scripts_auto_execute") + col.prop(system, "use_tabs_as_spaces") col.separator() col.separator() @@ -383,7 +383,7 @@ class USERPREF_PT_system(bpy.types.Panel): col.row().prop(system, "audio_device", expand=True) sub = col.column() sub.active = system.audio_device != 'NONE' - #sub.prop(system, "enable_all_codecs") + #sub.prop(system, "use_preview_images") sub.prop(system, "audio_channels", text="Channels") sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer") sub.prop(system, "audio_sample_rate", text="Sample Rate") @@ -406,9 +406,9 @@ class USERPREF_PT_system(bpy.types.Panel): # No translation in 2.5 yet #col.prop(system, "language") #col.label(text="Translate:") - #col.prop(system, "translate_tooltips", text="Tooltips") - #col.prop(system, "translate_buttons", text="Labels") - #col.prop(system, "translate_toolbox", text="Toolbox") + #col.prop(system, "use_translate_tooltips", text="Tooltips") + #col.prop(system, "use_translate_buttons", text="Labels") + #col.prop(system, "use_translate_toolbox", text="Toolbox") #col.separator() @@ -421,9 +421,9 @@ class USERPREF_PT_system(bpy.types.Panel): col = colsplit.column() col.label(text="OpenGL:") - col.prop(system, "clip_alpha", slider=True) + col.prop(system, "gl_clip_alpha", slider=True) col.prop(system, "use_mipmaps") - col.prop(system, "use_vbos") + col.prop(system, "use_vertex_buffer_objects") #Anti-aliasing is disabled as it breaks broder/lasso select #col.prop(system, "use_antialiasing") col.label(text="Window Draw Method:") @@ -679,13 +679,13 @@ class USERPREF_PT_file(bpy.types.Panel): sub.label(text="Animation Player:") sub = col1.column() - sub.prop(paths, "fonts_directory", text="") - sub.prop(paths, "textures_directory", text="") + sub.prop(paths, "font_directory", text="") + sub.prop(paths, "texture_directory", text="") sub.prop(paths, "texture_plugin_directory", text="") sub.prop(paths, "sequence_plugin_directory", text="") sub.prop(paths, "render_output_directory", text="") - sub.prop(paths, "python_scripts_directory", text="") - sub.prop(paths, "sounds_directory", text="") + sub.prop(paths, "script_directory", text="") + sub.prop(paths, "sound_directory", text="") sub.prop(paths, "temporary_directory", text="") sub.prop(paths, "image_editor", text="") subsplit = sub.split(percentage=0.3) @@ -695,10 +695,10 @@ class USERPREF_PT_file(bpy.types.Panel): col = split.column() col.label(text="Save & Load:") col.prop(paths, "use_relative_paths") - col.prop(paths, "compress_file") - col.prop(paths, "load_ui") - col.prop(paths, "filter_file_extensions") - col.prop(paths, "hide_dot_files_datablocks") + col.prop(paths, "use_file_compression") + col.prop(paths, "use_load_ui") + col.prop(paths, "use_filter_files") + col.prop(paths, "show_hidden_files_datablocks") col.separator() col.separator() @@ -706,10 +706,10 @@ class USERPREF_PT_file(bpy.types.Panel): col.label(text="Auto Save:") col.prop(paths, "save_version") col.prop(paths, "recent_files") - col.prop(paths, "save_preview_images") - col.prop(paths, "auto_save_temporary_files") + col.prop(paths, "use_save_preview_images") + col.prop(paths, "use_auto_save_temporary_files") sub = col.column() - sub.active = paths.auto_save_temporary_files + sub.active = paths.use_auto_save_temporary_files sub.prop(paths, "auto_save_time", text="Timer (mins)") from space_userpref_keymap import InputKeyMapPanel @@ -739,38 +739,38 @@ class USERPREF_PT_input(InputKeyMapPanel): sub.label(text="Mouse:") sub1 = sub.column() sub1.active = (inputs.select_mouse == 'RIGHT') - sub1.prop(inputs, "emulate_3_button_mouse") - sub.prop(inputs, "continuous_mouse") + sub1.prop(inputs, "use_mouse_emulate_3_button") + sub.prop(inputs, "use_mouse_continuous") sub.label(text="Select With:") sub.row().prop(inputs, "select_mouse", expand=True) sub = col.column() sub.label(text="Double Click:") - sub.prop(inputs, "double_click_time", text="Speed") + sub.prop(inputs, "mouse_double_click_time", text="Speed") sub.separator() - sub.prop(inputs, "emulate_numpad") + sub.prop(inputs, "use_emulate_numpad") sub.separator() sub.label(text="Orbit Style:") - sub.row().prop(inputs, "view_rotation", expand=True) + sub.row().prop(inputs, "view_rotate_method", expand=True) sub.label(text="Zoom Style:") - sub.row().prop(inputs, "zoom_style", text="") - if inputs.zoom_style == 'DOLLY': - sub.row().prop(inputs, "zoom_axis", expand=True) - sub.prop(inputs, "invert_zoom_direction") + sub.row().prop(inputs, "view_zoom_method", text="") + if inputs.view_zoom_method == 'DOLLY': + sub.row().prop(inputs, "view_zoom_axis", expand=True) + sub.prop(inputs, "invert_mouse_wheel_zoom") - #sub.prop(inputs, "use_middle_mouse_paste") + #sub.prop(inputs, "use_mouse_mmb_paste") #col.separator() sub = col.column() sub.label(text="Mouse Wheel:") - sub.prop(inputs, "wheel_invert_zoom", text="Invert Wheel Zoom Direction") + sub.prop(inputs, "invert_zoom_wheel", text="Invert Wheel Zoom Direction") #sub.prop(view, "wheel_scroll_lines", text="Scroll Lines") col.separator() diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 3b5dcafd90a..d7ab8034286 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -492,7 +492,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) /* Transform widget / manipulators */ row= uiLayoutRow(layout, 1); - uiItemR(row, &v3dptr, "use_manipulator", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", 0); block= uiLayoutGetBlock(row); if(v3d->twflag & V3D_USE_MANIPULATOR) { diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index f4b6d7ded0f..3467e41fd1e 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -405,7 +405,7 @@ static void rna_def_common_keying_flags(StructRNA *srna, short reg) RNA_def_property_ui_text(prop, "Insert Keyframes - Visual", "Insert keyframes based on 'visual transforms'"); if (reg) RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL); - prop= RNA_def_property(srna, "insertkey_xyz_to_rgb", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_insertkey_xyz_to_rgb", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "keyingflag", INSERTKEY_XYZ2RGB); RNA_def_property_ui_text(prop, "F-Curve Colors - XYZ to RGB", "Color for newly added transformation F-Curves (Location, Rotation, Scale) and also Color is based on the transform axis"); if (reg) RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL); diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index fb51fa26395..90ad12764e5 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -502,6 +502,7 @@ static void rna_def_color_ramp(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Interpolation", ""); RNA_def_property_update(prop, 0, "rna_ColorRamp_update"); +#if 0 // use len(elements) prop= RNA_def_property(srna, "total", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "tot"); /* needs a function to do the right thing when adding elements like colorband_add_cb() */ @@ -509,7 +510,8 @@ static void rna_def_color_ramp(BlenderRNA *brna) RNA_def_property_range(prop, 0, 31); /* MAXCOLORBAND = 32 */ RNA_def_property_ui_text(prop, "Total", "Total number of elements"); RNA_def_property_update(prop, 0, "rna_ColorRamp_update"); - +#endif + func = RNA_def_function(srna, "evaluate", "rna_ColorRamp_eval"); RNA_def_function_ui_description(func, "Evaluate ColorRamp"); prop= RNA_def_float(func, "position", 1.0f, 0.0f, 1.0f, "Position", "Evaluate ColorRamp at position", 0.0f, 1.0f); diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 9b4548e0de6..13f37db55ed 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -1221,7 +1221,7 @@ static void rna_def_material_halo(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Extreme Alpha", "Uses extreme alpha"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "shaded", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_shaded", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_SHADE); RNA_def_property_ui_text(prop, "Shaded", "Lets halo receive light and shadows from external objects"); RNA_def_property_update(prop, 0, "rna_Material_update"); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 7b4bbd48cc4..ced131aa49d 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1102,7 +1102,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_ALIGN, 0); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "use_manipulator", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_manipulator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "twflag", V3D_USE_MANIPULATOR); RNA_def_property_ui_text(prop, "Manipulator", "Use a 3D manipulator widget for controlling transforms"); RNA_def_property_ui_icon(prop, ICON_MANIPUL, 0); @@ -1218,7 +1218,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_range(prop, -10000.0, 10000.0, 10, 4); RNA_def_property_update(prop, NC_WINDOW, NULL); - prop= RNA_def_property(srna, "view_rotation", PROP_FLOAT, PROP_QUATERNION); + prop= RNA_def_property(srna, "view_rotate_method", PROP_FLOAT, PROP_QUATERNION); RNA_def_property_float_sdna(prop, NULL, "viewquat"); RNA_def_property_ui_text(prop, "View Rotation", "Rotation in quaternions (keep normalized)"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c index e8d1422d045..69f627dd462 100644 --- a/source/blender/makesrna/intern/rna_text.c +++ b/source/blender/makesrna/intern/rna_text.c @@ -199,7 +199,7 @@ static void rna_def_text(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flags", TXT_ISSCRIPT); RNA_def_property_ui_text(prop, "Register", "Register this text as a module on loading, Text name must end with \".py\""); - prop= RNA_def_property(srna, "tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", TXT_TABSTOSPACES); RNA_def_property_ui_text(prop, "Tabs as Spaces", "Automatically converts all new tabs into spaces"); diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 28570a5184b..720666a6180 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -41,7 +41,7 @@ static void rna_uiItemR(uiLayout *layout, PointerRNA *ptr, char *propname, char int flag= 0; if(!prop) { - printf("rna_uiItemR: property not found: %s\n", propname); + printf("rna_uiItemR: property not found: %s.%s\n", RNA_struct_identifier(ptr->type), propname); return; } diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 356d55b8120..c50f7ad2260 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -257,12 +257,14 @@ static void rna_def_userdef_theme_ui_font_style(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Shadow Size", "Shadow size in pixels (0, 3 and 5 supported)"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "shadx", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "shadow_offset_x", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "shadx"); RNA_def_property_range(prop, -10, 10); RNA_def_property_ui_text(prop, "Shadow X Offset", "Shadow offset in pixels"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "shady", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "shadow_offset_y", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "shady"); RNA_def_property_range(prop, -10, 10); RNA_def_property_ui_text(prop, "Shadow Y Offset", "Shadow offset in pixels"); RNA_def_property_update(prop, 0, "rna_userdef_update"); @@ -293,21 +295,21 @@ static void rna_def_userdef_theme_ui_style(BlenderRNA *brna) RNA_def_property_range(prop, 0.5, 2.0); RNA_def_property_ui_text(prop, "Panel Zoom", "Default zoom level for panel areas"); - prop= RNA_def_property(srna, "paneltitle", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "panel_title", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "paneltitle"); RNA_def_property_struct_type(prop, "ThemeFontStyle"); RNA_def_property_ui_text(prop, "Panel Font", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "grouplabel", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "group_label", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "grouplabel"); RNA_def_property_struct_type(prop, "ThemeFontStyle"); RNA_def_property_ui_text(prop, "Group Label Font", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "widgetlabel", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "widget_label", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "widgetlabel"); RNA_def_property_struct_type(prop, "ThemeFontStyle"); @@ -362,7 +364,7 @@ static void rna_def_userdef_theme_ui_wcol(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Text Selected", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "shaded", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_shaded", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shaded", 1); RNA_def_property_ui_text(prop, "Shaded", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); @@ -1211,7 +1213,7 @@ static void rna_def_userdef_theme_space_node(BlenderRNA *brna) rna_def_userdef_theme_spaces_main(srna, SPACE_NODE); - prop= RNA_def_property(srna, "wires", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "wire", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "wire"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Wires", ""); @@ -1639,7 +1641,7 @@ static void rna_def_userdef_theme_colorset(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Active", "Color used for active bones"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "colored_constraints", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_colored_constraints", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TH_WIRECOLOR_CONSTCOLS); RNA_def_property_ui_text(prop, "Colored Constraints", "Allow the use of colors indicating constraints/keyed status"); RNA_def_property_update(prop, 0, "rna_userdef_update"); @@ -1888,21 +1890,21 @@ static void rna_def_userdef_view(BlenderRNA *brna) /* View */ /* display */ - prop= RNA_def_property(srna, "tooltips", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_tooltips", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TOOLTIPS); RNA_def_property_ui_text(prop, "Tooltips", "Display tooltips"); - prop= RNA_def_property(srna, "display_object_info", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_object_info", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_DRAWVIEWINFO); RNA_def_property_ui_text(prop, "Display Object Info", "Display objects name and frame number in 3D view"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "global_scene", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_global_scene", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_SCENEGLOBAL); RNA_def_property_ui_text(prop, "Global Scene", "Forces the current Scene to be displayed in all Screens"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "use_large_cursors", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_large_cursors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "curssize", 0); RNA_def_property_ui_text(prop, "Large Cursors", "Use large mouse cursors when available"); RNA_def_property_update(prop, 0, "rna_userdef_update"); @@ -1922,7 +1924,7 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_userdef_update"); /* menus */ - prop= RNA_def_property(srna, "open_mouse_over", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mouse_over_open", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MENUOPENAUTO); RNA_def_property_ui_text(prop, "Open On Mouse Over", "Open menu buttons and pulldowns automatically when the mouse is hovering"); @@ -1947,33 +1949,33 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_range(prop, 1, 40); RNA_def_property_ui_text(prop, "Hold RMB Open Toolbox Delay", "Time in 1/10 seconds to hold the Right Mouse Button before opening the toolbox"); - prop= RNA_def_property(srna, "use_column_layout", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_column_layout", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_PLAINMENUS); RNA_def_property_ui_text(prop, "Toolbox Column Layout", "Use a column layout for toolbox"); - prop= RNA_def_property(srna, "directional_menus", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_directional_menus", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag", USER_MENUFIXEDORDER); RNA_def_property_ui_text(prop, "Contents Follow Opening Direction", "Otherwise menus, etc will always be top to bottom, left to right, no matter opening direction"); - prop= RNA_def_property(srna, "global_pivot", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_global_pivot", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_LOCKAROUND); RNA_def_property_ui_text(prop, "Global Pivot", "Lock the same rotation/scaling pivot in all 3D Views"); - prop= RNA_def_property(srna, "auto_depth", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mouse_auto_depth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ORBIT_ZBUF); RNA_def_property_ui_text(prop, "Auto Depth", "Use the depth under the mouse to improve view pan/rotate/zoom functionality"); /* view zoom */ - prop= RNA_def_property(srna, "zoom_to_mouse", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_zoom_to_mouse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ZOOM_TO_MOUSEPOS); RNA_def_property_ui_text(prop, "Zoom To Mouse Position", "Zoom in towards the mouse pointer's position in the 3D view, rather than the 2D window center"); /* view rotation */ - prop= RNA_def_property(srna, "auto_perspective", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_perspective", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_AUTOPERSP); RNA_def_property_ui_text(prop, "Auto Perspective", "Automatically switch between orthographic and perspective when changing from top/front/side views"); - prop= RNA_def_property(srna, "rotate_around_selection", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_rotate_around_active", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ORBIT_SELECTION); RNA_def_property_ui_text(prop, "Rotate Around Selection", "Use selection as the pivot point"); @@ -2006,7 +2008,7 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Rotation Angle", "The rotation step for numerical pad keys (2 4 6 8)"); /* 3D transform widget */ - prop= RNA_def_property(srna, "use_manipulator", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_manipulator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "tw_flag", 1); RNA_def_property_ui_text(prop, "Manipulator", "Use 3D transform manipulator"); RNA_def_property_update(prop, 0, "rna_userdef_update"); @@ -2035,7 +2037,7 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_userdef_update"); /* View2D Grid Displays */ - prop= RNA_def_property(srna, "view2d_grid_minimum_spacing", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "view2d_grid_spacing_min", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "v2d_min_gridsize"); RNA_def_property_range(prop, 1, 500); // XXX: perhaps the lower range should only go down to 5? RNA_def_property_ui_text(prop, "2D View Minimum Grid Spacing", "Minimum number of pixels between each gridline in 2D Viewports"); @@ -2087,11 +2089,11 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_enum_items(prop, object_align_items); RNA_def_property_ui_text(prop, "Align Object To", "When adding objects from a 3D View menu, either align them to that view's direction or the world coordinates"); - prop= RNA_def_property(srna, "enter_edit_mode", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_enter_edit_mode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_ADD_EDITMODE); RNA_def_property_ui_text(prop, "Enter Edit Mode", "Enter Edit Mode automatically after adding a new object"); - prop= RNA_def_property(srna, "drag_immediately", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_drag_immediately", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_RELEASECONFIRM); RNA_def_property_ui_text(prop, "Release confirm", "Moving things with a mouse drag confirms when releasing the button"); @@ -2106,7 +2108,7 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_range(prop, 0, 32767); RNA_def_property_ui_text(prop, "Undo Memory Size", "Maximum memory usage in megabytes (0 means unlimited)"); - prop= RNA_def_property(srna, "global_undo", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_global_undo", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_GLOBALUNDO); RNA_def_property_ui_text(prop, "Global Undo", "Global undo works by keeping a full copy of the file itself in memory, so takes extra memory"); @@ -2121,16 +2123,16 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, "rna_userdef_autokeymode_get", "rna_userdef_autokeymode_set", NULL); RNA_def_property_ui_text(prop, "Auto Keying Mode", "Mode of automatic keyframe insertion for Objects and Bones"); - prop= RNA_def_property(srna, "auto_keyframe_insert_available", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_keyframe_insert_available", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_INSERTAVAIL); RNA_def_property_ui_text(prop, "Auto Keyframe Insert Available", "Automatic keyframe insertion in available curves"); - prop= RNA_def_property(srna, "auto_keyframe_insert_keyingset", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_keyframe_insert_keyingset", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_ONLYKEYINGSET); RNA_def_property_ui_text(prop, "Auto Keyframe Insert Keying Set", "Automatic keyframe insertion using active Keying Set"); /* keyframing settings */ - prop= RNA_def_property(srna, "keyframe_insert_needed", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_keyframe_insert_needed", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_INSERTNEEDED); RNA_def_property_ui_text(prop, "Keyframe Insert Needed", "Keyframe insertion only when keyframe needed"); @@ -2138,7 +2140,7 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_AUTOMATKEY); RNA_def_property_ui_text(prop, "Visual Keying", "Use Visual keying automatically for constrained objects"); - prop= RNA_def_property(srna, "insertkey_xyz_to_rgb", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_insertkey_xyz_to_rgb", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "autokey_flag", AUTOKEY_FLAG_XYZ2RGB); RNA_def_property_ui_text(prop, "New F-Curve Colors - XYZ to RGB", "Color for newly added transformation F-Curves (Location, Rotation, Scale) and also Color is based on the transform axis"); @@ -2168,11 +2170,11 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_range(prop, 0, 100); RNA_def_property_ui_text(prop, "Grease Pencil Euclidean Distance", "Distance moved by mouse when drawing stroke (in pixels) to include"); - prop= RNA_def_property(srna, "grease_pencil_smooth_stroke", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_grease_pencil_smooth_stroke", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gp_settings", GP_PAINT_DOSMOOTH); RNA_def_property_ui_text(prop, "Grease Pencil Smooth Stroke", "Smooth the final stroke"); - prop= RNA_def_property(srna, "grease_pencil_simplify_stroke", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_grease_pencil_simplify_stroke", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gp_settings", GP_PAINT_DOSIMPLIFY); RNA_def_property_ui_text(prop, "Grease Pencil Simplify Stroke", "Simplify the final stroke"); @@ -2183,58 +2185,58 @@ static void rna_def_userdef_edit(BlenderRNA *brna) /* sculpt and paint */ - prop= RNA_def_property(srna, "sculpt_paint_overlay_col", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "sculpt_paint_overlay_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "sculpt_paint_overlay_col"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Sculpt/Paint Overlay Color", "Color of texture overlay"); /* duplication linking */ - prop= RNA_def_property(srna, "duplicate_mesh", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_mesh", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_MESH); RNA_def_property_ui_text(prop, "Duplicate Mesh", "Causes mesh data to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_surface", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_surface", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_SURF); RNA_def_property_ui_text(prop, "Duplicate Surface", "Causes surface data to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_curve", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_curve", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_CURVE); RNA_def_property_ui_text(prop, "Duplicate Curve", "Causes curve data to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_text", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_text", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_FONT); RNA_def_property_ui_text(prop, "Duplicate Text", "Causes text data to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_metaball", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_metaball", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_MBALL); RNA_def_property_ui_text(prop, "Duplicate Metaball", "Causes metaball data to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_armature", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_armature", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_ARM); RNA_def_property_ui_text(prop, "Duplicate Armature", "Causes armature data to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_lamp", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_lamp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_LAMP); RNA_def_property_ui_text(prop, "Duplicate Lamp", "Causes lamp data to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_material", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_material", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_MAT); RNA_def_property_ui_text(prop, "Duplicate Material", "Causes material data to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_texture", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_texture", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_TEX); RNA_def_property_ui_text(prop, "Duplicate Texture", "Causes texture data to be duplicated with the object"); // xxx - prop= RNA_def_property(srna, "duplicate_fcurve", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_fcurve", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_IPO); RNA_def_property_ui_text(prop, "Duplicate F-Curve", "Causes F-curve data to be duplicated with the object"); // xxx - prop= RNA_def_property(srna, "duplicate_action", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_action", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_ACT); RNA_def_property_ui_text(prop, "Duplicate Action", "Causes actions to be duplicated with the object"); - prop= RNA_def_property(srna, "duplicate_particle", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_duplicate_particle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_PSYS); RNA_def_property_ui_text(prop, "Duplicate Particle", "Causes particle systems to be duplicated with the object"); } @@ -2358,7 +2360,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) /* Language */ - prop= RNA_def_property(srna, "international_fonts", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_international_fonts", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_DOTRANSLATE); RNA_def_property_ui_text(prop, "International Fonts", "Use international fonts"); RNA_def_property_update(prop, 0, "rna_userdef_update"); @@ -2381,17 +2383,17 @@ static void rna_def_userdef_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Language", "Language use for translation"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "translate_tooltips", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_translate_tooltips", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_TOOLTIPS); RNA_def_property_ui_text(prop, "Translate Tooltips", "Translate Tooltips"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "translate_buttons", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_translate_buttons", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_BUTTONS); RNA_def_property_ui_text(prop, "Translate Buttons", "Translate button labels"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "translate_toolbox", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_translate_toolbox", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transopts", USER_TR_MENUS); RNA_def_property_ui_text(prop, "Translate Toolbox", "Translate toolbox menu"); RNA_def_property_update(prop, 0, "rna_userdef_update"); @@ -2425,16 +2427,16 @@ static void rna_def_userdef_system(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "color_picker_type"); RNA_def_property_ui_text(prop, "Color Picker Type", "Different styles of displaying the color picker widget"); - prop= RNA_def_property(srna, "enable_all_codecs", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_preview_images", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ALLWINCODECS); RNA_def_property_ui_text(prop, "Enable All Codecs", "Enables automatic saving of preview images in the .blend file (Windows only)"); - prop= RNA_def_property(srna, "auto_execute_scripts", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_scripts_auto_execute", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_SCRIPT_AUTOEXEC_DISABLE); RNA_def_property_ui_text(prop, "Auto Run Python Scripts", "Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source)"); RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update"); - prop= RNA_def_property(srna, "tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE); RNA_def_property_ui_text(prop, "Tabs as Spaces", "Automatically converts all new tabs into spaces for new and loaded text files"); @@ -2454,7 +2456,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) RNA_def_property_range(prop, 0, 32727); RNA_def_property_ui_text(prop, "Frame Server Port", "Frameserver Port for Frameserver Rendering"); - prop= RNA_def_property(srna, "clip_alpha", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "gl_clip_alpha", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "glalphaclip"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Clip Alpha", "Clip alpha below this threshold in the 3D textured view"); @@ -2465,7 +2467,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Mipmaps", "Scale textures for the 3D View (looks nicer but uses more memory and slows image reloading)"); RNA_def_property_update(prop, 0, "rna_userdef_mipmap_update"); - prop= RNA_def_property(srna, "use_vbos", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_vertex_buffer_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_VBO); RNA_def_property_ui_text(prop, "VBOs", "Use Vertex Buffer Objects (or Vertex Arrays, if unsupported) for viewport rendering"); @@ -2583,26 +2585,26 @@ static void rna_def_userdef_input(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, NULL, "rna_userdef_select_mouse_set", NULL); RNA_def_property_ui_text(prop, "Select Mouse", "The mouse button used for selection"); - prop= RNA_def_property(srna, "zoom_style", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "view_zoom_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "viewzoom"); RNA_def_property_enum_items(prop, view_zoom_styles); RNA_def_property_ui_text(prop, "Zoom Style", "Which style to use for viewport scaling"); - prop= RNA_def_property(srna, "zoom_axis", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "view_zoom_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "uiflag"); RNA_def_property_enum_items(prop, view_zoom_axes); RNA_def_property_ui_text(prop, "Zoom Axis", "Axis of mouse movement to zoom in or out on"); - prop= RNA_def_property(srna, "invert_zoom_direction", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_mouse_wheel_zoom", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ZOOM_INVERT); RNA_def_property_ui_text(prop, "Invert Zoom Direction", "Invert the axis of mouse movement for zooming"); - prop= RNA_def_property(srna, "view_rotation", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "view_rotate_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, view_rotation_items); RNA_def_property_ui_text(prop, "View Rotation", "Rotation style in the viewport"); - prop= RNA_def_property(srna, "continuous_mouse", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mouse_continuous", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_CONTINUOUS_MOUSE); RNA_def_property_ui_text(prop, "Continuous Grab", "Allow moving the mouse outside the view on some manipulations (transform, ui control drag)"); @@ -2616,25 +2618,25 @@ static void rna_def_userdef_input(BlenderRNA *brna) RNA_def_property_range(prop, 0, 200); RNA_def_property_ui_text(prop, "NDof Rotation Speed", "The overall rotation speed of an NDOF device, as percent of standard"); - prop= RNA_def_property(srna, "double_click_time", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "mouse_double_click_time", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "dbl_click_time"); RNA_def_property_range(prop, 1, 1000); RNA_def_property_ui_text(prop, "Double Click Timeout", "The time (in ms) for a double click"); - prop= RNA_def_property(srna, "emulate_3_button_mouse", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mouse_emulate_3_button", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TWOBUTTONMOUSE); RNA_def_property_ui_text(prop, "Emulate 3 Button Mouse", "Emulates Middle Mouse with Alt+LeftMouse (doesn't work with Left Mouse Select option)"); - prop= RNA_def_property(srna, "emulate_numpad", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_emulate_numpad", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_NONUMPAD); RNA_def_property_ui_text(prop, "Emulate Numpad", "Causes the 1 to 0 keys to act as the numpad (useful for laptops)"); /* middle mouse button */ - prop= RNA_def_property(srna, "use_middle_mouse_paste", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mouse_mmb_paste", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MMB_PASTE); RNA_def_property_ui_text(prop, "Middle Mouse Paste", "In text window, paste with middle mouse button instead of panning"); - prop= RNA_def_property(srna, "wheel_invert_zoom", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_zoom_wheel", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_WHEELZOOMDIR); RNA_def_property_ui_text(prop, "Wheel Invert Zoom", "Swap the Mouse Wheel zoom direction"); @@ -2670,11 +2672,11 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) RNA_def_struct_nested(brna, srna, "UserPreferences"); RNA_def_struct_ui_text(srna, "File Paths", "Default paths for external files"); - prop= RNA_def_property(srna, "hide_dot_files_datablocks", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_hidden_files_datablocks", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_HIDE_DOT); RNA_def_property_ui_text(prop, "Hide Dot Files/Datablocks", "Hide files/datablocks that start with a dot(.*)"); - prop= RNA_def_property(srna, "filter_file_extensions", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_filter_files", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_FILTERFILEEXTS); RNA_def_property_ui_text(prop, "Filter File Extensions", "Display only files with extensions in the image select window"); @@ -2682,19 +2684,19 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_RELPATHS); RNA_def_property_ui_text(prop, "Relative Paths", "Default relative path option for the file selector"); - prop= RNA_def_property(srna, "compress_file", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_file_compression", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_FILECOMPRESS); RNA_def_property_ui_text(prop, "Compress File", "Enable file compression when saving .blend files"); - prop= RNA_def_property(srna, "load_ui", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_load_ui", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_FILENOUI); RNA_def_property_ui_text(prop, "Load UI", "Load user interface setup when loading .blend files"); - prop= RNA_def_property(srna, "fonts_directory", PROP_STRING, PROP_DIRPATH); + prop= RNA_def_property(srna, "font_directory", PROP_STRING, PROP_DIRPATH); RNA_def_property_string_sdna(prop, NULL, "fontdir"); RNA_def_property_ui_text(prop, "Fonts Directory", "The default directory to search for loading fonts"); - prop= RNA_def_property(srna, "textures_directory", PROP_STRING, PROP_DIRPATH); + prop= RNA_def_property(srna, "texture_directory", PROP_STRING, PROP_DIRPATH); RNA_def_property_string_sdna(prop, NULL, "textudir"); RNA_def_property_ui_text(prop, "Textures Directory", "The default directory to search for textures"); @@ -2710,11 +2712,11 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) RNA_def_property_string_sdna(prop, NULL, "renderdir"); RNA_def_property_ui_text(prop, "Render Output Directory", "The default directory for rendering output"); - prop= RNA_def_property(srna, "python_scripts_directory", PROP_STRING, PROP_DIRPATH); + prop= RNA_def_property(srna, "script_directory", PROP_STRING, PROP_DIRPATH); RNA_def_property_string_sdna(prop, NULL, "pythondir"); RNA_def_property_ui_text(prop, "Python Scripts Directory", "The default directory to search for Python scripts (resets python module search path: sys.path)"); - prop= RNA_def_property(srna, "sounds_directory", PROP_STRING, PROP_DIRPATH); + prop= RNA_def_property(srna, "sound_directory", PROP_STRING, PROP_DIRPATH); RNA_def_property_string_sdna(prop, NULL, "sounddir"); RNA_def_property_ui_text(prop, "Sounds Directory", "The default directory to search for sounds"); @@ -2744,7 +2746,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) RNA_def_property_range(prop, 0, 32); RNA_def_property_ui_text(prop, "Save Versions", "The number of old versions to maintain in the current directory, when manually saving"); - prop= RNA_def_property(srna, "auto_save_temporary_files", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_save_temporary_files", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOSAVE); RNA_def_property_ui_text(prop, "Auto Save Temporary Files", "Automatic saving of temporary files"); RNA_def_property_update(prop, 0, "rna_userdef_autosave_update"); @@ -2759,7 +2761,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) RNA_def_property_range(prop, 0, 30); RNA_def_property_ui_text(prop, "Recent Files", "Maximum number of recently opened files to remember"); - prop= RNA_def_property(srna, "save_preview_images", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_save_preview_images", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_SAVE_PREVIEWS); RNA_def_property_ui_text(prop, "Save Preview Images", "Enables automatic saving of preview images in the .blend file"); } @@ -2821,7 +2823,7 @@ void RNA_def_userdef(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Theme"); RNA_def_property_ui_text(prop, "Themes", ""); - prop= RNA_def_property(srna, "uistyles", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "ui_styles", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "uistyles", NULL); RNA_def_property_struct_type(prop, "ThemeStyle"); RNA_def_property_ui_text(prop, "Styles", ""); diff --git a/source/blender/python/doc/sphinx_doc_gen.py b/source/blender/python/doc/sphinx_doc_gen.py index 92f795084f3..3beb17f194e 100644 --- a/source/blender/python/doc/sphinx_doc_gen.py +++ b/source/blender/python/doc/sphinx_doc_gen.py @@ -353,6 +353,7 @@ def rna2sphinx(BASEPATH): fw(" * data API, access to attributes of blender data such as mesh verts, material color, timeline frames and scene objects\n") fw(" * user interface functions for defining buttons, creation of menus, headers, panels\n") fw(" * modules: bgl, mathutils and geometry\n") + fw(" * game engine modules\n") fw("\n") fw("===================\n") |