diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-17 11:49:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-17 11:49:53 +0400 |
commit | b9d99b9c5b03f5e4741753f07eafe5c882bfcd02 (patch) | |
tree | 4d69b94175d7047a713b793757b7b8a853c0cb3b | |
parent | 40bf37e3b661cf7675cbd578391c379332522c40 (diff) |
apply all rna naming changes for rna_space.c
22 files changed, 196 insertions, 194 deletions
diff --git a/release/scripts/op/nla.py b/release/scripts/op/nla.py index bec5f5b3909..44bd5d91e32 100644 --- a/release/scripts/op/nla.py +++ b/release/scripts/op/nla.py @@ -150,7 +150,7 @@ class BakeAction(bpy.types.Operator): def execute(self, context): props = self.properties - action = bake(props.frame_start, props.frame_end, props.step, props.only_selected) + action = bake(props.frame_start, props.frame_end, props.step, props.show_only_selected) # basic cleanup, could move elsewhere for fcu in action.fcurves: diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/interaction/maya.py index ba4eae89982..5758e5d841a 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.manipulator', 'LEFTMOUSE', 'PRESS', any=True) +kmi = km.items.add('view3d.use_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) @@ -126,11 +126,11 @@ kmi.properties.nr = 9 kmi = km.items.add('view3d.layers', 'ZERO', 'PRESS', any=True) kmi.properties.nr = 10 kmi = km.items.add('wm.context_toggle_enum', 'Z', 'PRESS') -kmi.properties.data_path = 'space_data.viewport_shading' +kmi.properties.data_path = 'space_data.viewport_shade' kmi.properties.value_1 = 'SOLID' kmi.properties.value_2 = 'WIREFRAME' kmi = km.items.add('wm.context_toggle_enum', 'Z', 'PRESS', alt=True) -kmi.properties.data_path = 'space_data.viewport_shading' +kmi.properties.data_path = 'space_data.viewport_shade' kmi.properties.value_1 = 'TEXTURED' kmi.properties.value_2 = 'SOLID' kmi = km.items.add('view3d.select', 'SELECTMOUSE', 'PRESS') @@ -173,9 +173,9 @@ kmi = km.items.add('wm.context_set_enum', 'COMMA', 'PRESS', ctrl=True) kmi.properties.data_path = 'space_data.pivot_point' kmi.properties.value = 'MEDIAN_POINT' kmi = km.items.add('wm.context_toggle', 'COMMA', 'PRESS', alt=True) -kmi.properties.data_path = 'space_data.pivot_point_align' +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.manipulator' +kmi.properties.data_path = 'space_data.use_manipulator' kmi = km.items.add('wm.context_set_enum', 'PERIOD', 'PRESS') kmi.properties.data_path = 'space_data.pivot_point' kmi.properties.value = 'CURSOR' diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 21cdae98524..cf7554a7b10 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -122,7 +122,7 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, bpy.types.Panel): col = split.column() if not space.pin_id: - col.prop(space, "brush_texture", text="Brush", toggle=True) + col.prop(space, "show_brush_texture", text="Brush", toggle=True) if tex: split = layout.split(percentage=0.2) diff --git a/release/scripts/ui/space_console.py b/release/scripts/ui/space_console.py index feda3a54b41..f2264a5c926 100644 --- a/release/scripts/ui/space_console.py +++ b/release/scripts/ui/space_console.py @@ -48,7 +48,7 @@ class CONSOLE_HT_header(bpy.types.Header): row.prop(sc, "show_report_debug", text="Debug") row.prop(sc, "show_report_info", text="Info") row.prop(sc, "show_report_operator", text="Operators") - row.prop(sc, "show_report_warn", text="Warnings") + row.prop(sc, "show_report_warning", text="Warnings") row.prop(sc, "show_report_error", text="Errors") row = layout.row() diff --git a/release/scripts/ui/space_dopesheet.py b/release/scripts/ui/space_dopesheet.py index f7e7ee724d7..71f7490c209 100644 --- a/release/scripts/ui/space_dopesheet.py +++ b/release/scripts/ui/space_dopesheet.py @@ -56,7 +56,7 @@ class DOPESHEET_HT_header(bpy.types.Header): layout.template_ID(st, "action", new="action.new") if st.mode != 'GPENCIL': - layout.prop(st, "autosnap", text="") + layout.prop(st, "auto_snap", text="") row = layout.row(align=True) row.operator("action.copy", text="", icon='COPYDOWN') @@ -73,10 +73,10 @@ class DOPESHEET_MT_view(bpy.types.Menu): layout.column() - layout.prop(st, "realtime_updates") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "use_realtime_update") + layout.prop(st, "show_frame_indicator") layout.prop(st, "show_sliders") - layout.prop(st, "automerge_keyframes") + layout.prop(st, "use_auto_merge_keyframes") layout.prop(st, "use_marker_sync") if st.show_seconds: diff --git a/release/scripts/ui/space_graph.py b/release/scripts/ui/space_graph.py index 7eb728cc668..e5ba894f8ad 100644 --- a/release/scripts/ui/space_graph.py +++ b/release/scripts/ui/space_graph.py @@ -44,7 +44,7 @@ class GRAPH_HT_header(bpy.types.Header): layout.template_dopesheet_filter(st.dopesheet) - layout.prop(st, "autosnap", text="") + layout.prop(st, "auto_snap", text="") layout.prop(st, "pivot_point", text="", icon_only=True) row = layout.row(align=True) @@ -71,19 +71,19 @@ class GRAPH_MT_view(bpy.types.Menu): layout.operator("graph.properties", icon='MENU_PANEL') layout.separator() - layout.prop(st, "realtime_updates") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "use_realtime_update") + layout.prop(st, "show_frame_indicator") layout.prop(st, "show_cursor") layout.prop(st, "show_sliders") - layout.prop(st, "automerge_keyframes") + layout.prop(st, "use_auto_merge_keyframes") layout.separator() if st.show_handles: layout.operator("graph.handles_view_toggle", icon='CHECKBOX_HLT', text="Show All Handles") else: layout.operator("graph.handles_view_toggle", icon='CHECKBOX_DEHLT', text="Show All Handles") - layout.prop(st, "only_selected_curves_handles") - layout.prop(st, "only_selected_keyframe_handles") + layout.prop(st, "use_only_selected_curves_handles") + layout.prop(st, "use_only_selected_keyframe_handles") layout.operator("anim.time_toggle") layout.separator() diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index b3598b4d04c..0e6c3922685 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -48,10 +48,10 @@ class IMAGE_MT_view(bpy.types.Menu): layout.separator() - layout.prop(sima, "update_automatically") + layout.prop(sima, "use_realtime_update") if show_uvedit: layout.prop(toolsettings, "uv_local_view") # Numpad / - layout.prop(uv, "draw_other_objects") + layout.prop(uv, "show_other_objects") layout.separator() @@ -144,7 +144,7 @@ class IMAGE_MT_image(bpy.types.Menu): layout.separator() - layout.prop(sima, "image_painting") + layout.prop(sima, "use_image_paint") class IMAGE_MT_uvs_showhide(bpy.types.Menu): @@ -217,12 +217,12 @@ class IMAGE_MT_uvs(bpy.types.Menu): uv = sima.uv_editor toolsettings = context.tool_settings - layout.prop(uv, "snap_to_pixels") - layout.prop(uv, "constrain_to_image_bounds") + layout.prop(uv, "use_snap_to_pixels") + layout.prop(uv, "lock_bounds") layout.separator() - layout.prop(uv, "live_unwrap") + layout.prop(uv, "use_live_unwrap") layout.operator("uv.unwrap") layout.operator("uv.pin", text="Unpin").clear = True layout.operator("uv.pin") @@ -288,13 +288,13 @@ class IMAGE_HT_header(bpy.types.Header): layout.template_ID(sima, "image", new="image.new") if not show_render: - layout.prop(sima, "image_pin", text="") + layout.prop(sima, "use_image_pin", text="") # uv editing if show_uvedit: uvedit = sima.uv_editor - layout.prop(uvedit, "pivot", text="", icon_only=True) + layout.prop(uvedit, "pivot_point", text="", icon_only=True) layout.prop(toolsettings, "uv_sync_selection", text="") if toolsettings.uv_sync_selection: @@ -304,7 +304,7 @@ class IMAGE_HT_header(bpy.types.Header): row.prop(toolsettings, "mesh_selection_mode", text="", index=2, icon='FACESEL') else: layout.prop(toolsettings, "uv_selection_mode", text="", expand=True) - layout.prop(uvedit, "sticky_selection_mode", text="", icon_only=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) @@ -323,7 +323,7 @@ class IMAGE_HT_header(bpy.types.Header): layout.template_image_layers(ima, iuser) # painting - layout.prop(sima, "image_painting", text="") + layout.prop(sima, "use_image_paint", text="") # draw options row = layout.row(align=True) @@ -335,8 +335,8 @@ class IMAGE_HT_header(bpy.types.Header): if ima.type == 'COMPOSITE' and ima.source in ('MOVIE', 'SEQUENCE'): row.operator("image.play_composite", icon='PLAY') - if show_uvedit or sima.image_painting: - layout.prop(sima, "update_automatically", text="", icon_only=True, icon='LOCKED') + if show_uvedit or sima.use_image_paint: + layout.prop(sima, "use_realtime_update", text="", icon_only=True, icon='LOCKED') class IMAGE_PT_image_properties(bpy.types.Panel): @@ -525,13 +525,13 @@ class IMAGE_PT_view_properties(bpy.types.Panel): col = split.column() col.label(text="Coordinates:") - col.prop(sima, "draw_repeated", text="Repeat") + col.prop(sima, "show_repeat", text="Repeat") if show_uvedit: - col.prop(uvedit, "normalized_coordinates", text="Normalized") + col.prop(uvedit, "show_normalized_coords", text="Normalized") elif show_uvedit: col.label(text="Coordinates:") - col.prop(uvedit, "normalized_coordinates", text="Normalized") + col.prop(uvedit, "show_normalized_coords", text="Normalized") if show_uvedit: @@ -545,15 +545,15 @@ class IMAGE_PT_view_properties(bpy.types.Panel): split = layout.split() col = split.column() - col.prop(uvedit, "draw_smooth_edges", text="Smooth") - col.prop(uvedit, "draw_modified_edges", text="Modified") + 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 = split.column() - col.prop(uvedit, "draw_stretch", text="Stretch") + col.prop(uvedit, "show_stretch", text="Stretch") sub = col.column() - sub.active = uvedit.draw_stretch + sub.active = uvedit.show_stretch sub.row().prop(uvedit, "draw_stretch_type", expand=True) diff --git a/release/scripts/ui/space_nla.py b/release/scripts/ui/space_nla.py index 1141a640534..ceabc0af00f 100644 --- a/release/scripts/ui/space_nla.py +++ b/release/scripts/ui/space_nla.py @@ -42,7 +42,7 @@ class NLA_HT_header(bpy.types.Header): layout.template_dopesheet_filter(st.dopesheet) - layout.prop(st, "autosnap", text="") + layout.prop(st, "auto_snap", text="") class NLA_MT_view(bpy.types.Menu): @@ -59,8 +59,8 @@ class NLA_MT_view(bpy.types.Menu): layout.separator() - layout.prop(st, "realtime_updates") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "use_realtime_update") + layout.prop(st, "show_frame_indicator") layout.operator("anim.time_toggle", text="Show Frames" if st.show_seconds else "Show Seconds") diff --git a/release/scripts/ui/space_node.py b/release/scripts/ui/space_node.py index 0a3cebf5faa..715d684e288 100644 --- a/release/scripts/ui/space_node.py +++ b/release/scripts/ui/space_node.py @@ -67,7 +67,7 @@ class NODE_HT_header(bpy.types.Header): layout.prop(scene, "use_nodes") layout.prop(scene.render, "free_unused_nodes", text="Free Unused") - layout.prop(snode, "backdrop") + layout.prop(snode, "show_backdrop") layout.separator() @@ -90,7 +90,7 @@ class NODE_MT_view(bpy.types.Menu): layout.operator("node.view_all") - if context.space_data.backdrop: + if context.space_data.show_backdrop: layout.separator() layout.operator("node.backimage_move",text = "Backdrop move") diff --git a/release/scripts/ui/space_outliner.py b/release/scripts/ui/space_outliner.py index 6b2743027ba..e170dc0322c 100644 --- a/release/scripts/ui/space_outliner.py +++ b/release/scripts/ui/space_outliner.py @@ -42,7 +42,7 @@ class OUTLINER_HT_header(bpy.types.Header): layout.prop(space, "display_mode", text="") - layout.prop(space, "display_filter", icon='VIEWZOOM', text="") + layout.prop(space, "filter_text", icon='VIEWZOOM', text="") layout.separator() @@ -73,7 +73,7 @@ class OUTLINER_MT_view(bpy.types.Menu): col = layout.column() if space.display_mode not in ('DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'): - col.prop(space, "show_restriction_columns") + col.prop(space, "show_restrict_columns") col.separator() col.operator("outliner.show_active") @@ -96,8 +96,8 @@ class OUTLINER_MT_search(bpy.types.Menu): col = layout.column() - col.prop(space, "match_case_sensitive") - col.prop(space, "match_complete") + col.prop(space, "use_filter_case_sensitive") + col.prop(space, "use_filter_complete") class OUTLINER_MT_edit_datablocks(bpy.types.Menu): diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index 3a828bfb6d0..582384660e0 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -143,12 +143,12 @@ class SEQUENCER_MT_view(bpy.types.Menu): layout.operator("sequencer.view_selected") - layout.prop(st, "draw_frames") - layout.prop(st, "show_cframe_indicator") + layout.prop(st, "show_frames") + layout.prop(st, "show_frame_indicator") if st.display_mode == 'IMAGE': - layout.prop(st, "draw_safe_margin") + layout.prop(st, "show_safe_margin") if st.display_mode == 'WAVEFORM': - layout.prop(st, "separate_color_preview") + layout.prop(st, "show_separate_color") layout.separator() layout.prop(st, "use_marker_sync") @@ -787,9 +787,9 @@ class SEQUENCER_PT_view(SequencerButtonsPanel_Output, bpy.types.Panel): col = layout.column() if st.display_mode == 'IMAGE': col.prop(st, "draw_overexposed") # text="Zebra" - col.prop(st, "draw_safe_margin") + col.prop(st, "show_safe_margin") if st.display_mode == 'WAVEFORM': - col.prop(st, "separate_color_preview") + col.prop(st, "show_separate_color") col.prop(st, "proxy_render_size") def register(): diff --git a/release/scripts/ui/space_text.py b/release/scripts/ui/space_text.py index d9fce39fee8..59acb66a2d3 100644 --- a/release/scripts/ui/space_text.py +++ b/release/scripts/ui/space_text.py @@ -85,7 +85,7 @@ class TEXT_PT_properties(bpy.types.Panel): flow.prop(st, "show_word_wrap") flow.prop(st, "show_syntax_highlight") flow.prop(st, "show_line_highlight") - flow.prop(st, "live_edit") + flow.prop(st, "use_live_edit") flow = layout.column_flow() flow.prop(st, "font_size") @@ -125,8 +125,8 @@ class TEXT_PT_find(bpy.types.Panel): # settings row = layout.row() - row.prop(st, "find_wrap", text="Wrap") - row.prop(st, "find_all", text="All") + row.prop(st, "use_find_wrap", text="Wrap") + row.prop(st, "use_find_all", text="All") class TEXT_MT_view(bpy.types.Menu): diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index 3825d774f1e..9b8eb3327cd 100644 --- a/release/scripts/ui/space_time.py +++ b/release/scripts/ui/space_time.py @@ -95,8 +95,8 @@ class TIME_MT_view(bpy.types.Menu): layout.separator() - layout.prop(st, "show_cframe_indicator") - layout.prop(st, "only_selected") + layout.prop(st, "show_frame_indicator") + layout.prop(st, "show_only_selected") layout.separator() @@ -166,13 +166,13 @@ class TIME_MT_playback(bpy.types.Menu): st = context.space_data scene = context.scene - layout.prop(st, "play_top_left") - layout.prop(st, "play_all_3d") - layout.prop(st, "play_anim") - layout.prop(st, "play_buttons") - layout.prop(st, "play_image") - layout.prop(st, "play_sequencer") - layout.prop(st, "play_nodes") + layout.prop(st, "use_play_top_left_3d_editor") + layout.prop(st, "use_play_3d_editors") + layout.prop(st, "use_play_animation_editors") + layout.prop(st, "use_play_properties_editors") + layout.prop(st, "use_play_image_editors") + layout.prop(st, "use_play_sequence_editors") + layout.prop(st, "use_play_node_editors") layout.separator() diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py index 24d77dbed32..ed245d2ee91 100644 --- a/release/scripts/ui/space_userpref_keymap.py +++ b/release/scripts/ui/space_userpref_keymap.py @@ -369,13 +369,13 @@ class InputKeyMapPanel(bpy.types.Panel): layout.set_context_pointer("keyconfig", wm.active_keyconfig) row.operator("wm.keyconfig_remove", text="", icon='X') - row.prop(context.space_data, "filter", icon="VIEWZOOM") + row.prop(context.space_data, "filter_text", icon="VIEWZOOM") col.separator() display_keymaps = _merge_keymaps(kc, defkc) - if context.space_data.filter != "": - filter = context.space_data.filter.lower() + if context.space_data.filter_text != "": + filter_text = context.space_data.filter_text.lower() self.draw_filtered(display_keymaps, filter, col) else: self.draw_hierarchy(display_keymaps, col) @@ -739,8 +739,8 @@ class WM_OT_keyitem_add(bpy.types.Operator): km.items.add("none", 'A', 'PRESS') # kmi # clear filter and expand keymap so we can see the newly added item - if context.space_data.filter != '': - context.space_data.filter = '' + if context.space_data.filter_text != "": + context.space_data.filter_text = "" km.items_expanded = True km.children_expanded = True diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 38e91de3884..6dd7cc5187c 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -71,8 +71,8 @@ class VIEW3D_HT_header(bpy.types.Header): row.prop(toolsettings.particle_edit, "selection_mode", text="", expand=True, toggle=True) # Occlude geometry - if view.viewport_shading in ('SOLID', 'SHADED', 'TEXTURED') and (obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')): - row.prop(view, "occlude_geometry", text="") + if view.viewport_shade in ('SOLID', 'SHADED', 'TEXTURED') and (obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')): + row.prop(view, "use_occlude_geometry", text="") # Proportional editing if obj.mode in ('EDIT', 'PARTICLE_EDIT'): @@ -2016,14 +2016,14 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): ob = context.object col = layout.column() - col.prop(view, "display_render_override") + col.prop(view, "show_only_render") col = layout.column() - display_all = not view.display_render_override + display_all = not view.show_only_render col.active = display_all - col.prop(view, "outline_selected") - col.prop(view, "all_object_origins") - col.prop(view, "relationship_lines") + col.prop(view, "show_outline_selected") + col.prop(view, "show_all_objects_origin") + col.prop(view, "show_relationship_lines") if ob and ob.type == 'MESH': mesh = ob.data col.prop(mesh, "all_edges") @@ -2031,15 +2031,15 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): col = layout.column() col.active = display_all split = col.split(percentage=0.55) - split.prop(view, "display_floor", text="Grid Floor") + split.prop(view, "show_floor", text="Grid Floor") row = split.row(align=True) - row.prop(view, "display_x_axis", text="X", toggle=True) - row.prop(view, "display_y_axis", text="Y", toggle=True) - row.prop(view, "display_z_axis", text="Z", toggle=True) + row.prop(view, "show_axis_x", text="X", toggle=True) + row.prop(view, "show_axis_y", text="Y", toggle=True) + row.prop(view, "show_axis_z", text="Z", toggle=True) sub = col.column(align=True) - sub.active = (display_all and view.display_floor) + sub.active = (display_all and view.show_floor) sub.prop(view, "grid_lines", text="Lines") sub.prop(view, "grid_spacing", text="Spacing") sub.prop(view, "grid_subdivisions", text="Subdivisions") @@ -2047,7 +2047,7 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): col = layout.column() col.label(text="Shading:") col.prop(gs, "material_mode", text="") - col.prop(view, "textured_solid") + col.prop(view, "show_textured_solid") layout.separator() @@ -2141,7 +2141,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel): layout = self.layout view = context.space_data - layout.prop(view, "display_background_images", text="") + layout.prop(view, "show_background_images", text="") def draw(self, context): layout = self.layout @@ -2152,7 +2152,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel): col.operator("view3d.add_background_image", text="Add Image") for i, bg in enumerate(view.background_images): - layout.active = view.display_background_images + layout.active = view.show_background_images box = layout.box() row = box.row(align=True) row.prop(bg, "show_expanded", text="", emboss=False) diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index d7f8803b3bf..8b46aae93ad 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -3193,7 +3193,7 @@ static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *lo } subrow= uiLayoutRow(row, 0); - uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "sensors_show_active_states") + uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "show_sensors_active_states") && RNA_boolean_get(ptr, "expanded")) || RNA_boolean_get(ptr, "pinned"))); uiItemR(subrow, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0); @@ -3636,7 +3636,7 @@ static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA * } subrow= uiLayoutRow(row, 0); - uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "actuators_show_active_states") + uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "show_actuators_active_states") && RNA_boolean_get(ptr, "expanded")) || RNA_boolean_get(ptr, "pinned"))); uiItemR(subrow, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0); @@ -4469,9 +4469,9 @@ static void logic_buttons_new(bContext *C, ARegion *ar) uiDefBlockBut(block, controller_menu, NULL, "Controllers", xco-10, yco, 300, UI_UNIT_Y, ""); /* replace this with uiLayout stuff later */ - uiItemR(row, &logic_ptr, "controllers_show_selected_objects", 0, "Sel", 0); - uiItemR(row, &logic_ptr, "controllers_show_active_objects", 0, "Act", 0); - uiItemR(row, &logic_ptr, "controllers_show_linked_controller", 0, "Link", 0); + uiItemR(row, &logic_ptr, "show_controllers_selected_objects", 0, "Sel", 0); + uiItemR(row, &logic_ptr, "show_controllers_active_object", 0, "Act", 0); + uiItemR(row, &logic_ptr, "show_controllers_linked_controller", 0, "Link", 0); for(a=0; a<count; a++) { bController *cont; @@ -4572,10 +4572,10 @@ static void logic_buttons_new(bContext *C, ARegion *ar) uiDefBlockBut(block, sensor_menu, NULL, "Sensors", xco-10, yco, 300, UI_UNIT_Y, ""); /* replace this with uiLayout stuff later */ - uiItemR(row, &logic_ptr, "sensors_show_selected_objects", 0, "Sel", 0); - uiItemR(row, &logic_ptr, "sensors_show_active_objects", 0, "Act", 0); - uiItemR(row, &logic_ptr, "sensors_show_linked_controller", 0, "Link", 0); - uiItemR(row, &logic_ptr, "sensors_show_active_states", 0, "State", 0); + uiItemR(row, &logic_ptr, "show_sensors_selected_objects", 0, "Sel", 0); + uiItemR(row, &logic_ptr, "show_sensors_active_object", 0, "Act", 0); + uiItemR(row, &logic_ptr, "show_sensors_linked_controller", 0, "Link", 0); + uiItemR(row, &logic_ptr, "show_sensors_active_states", 0, "State", 0); for(a=0; a<count; a++) { bSensor *sens; @@ -4638,10 +4638,10 @@ static void logic_buttons_new(bContext *C, ARegion *ar) uiDefBlockBut(block, actuator_menu, NULL, "Actuators", xco-10, yco, 300, UI_UNIT_Y, ""); /* replace this with uiLayout stuff later */ - uiItemR(row, &logic_ptr, "actuators_show_selected_objects", 0, "Sel", 0); - uiItemR(row, &logic_ptr, "actuators_show_active_objects", 0, "Act", 0); - uiItemR(row, &logic_ptr, "actuators_show_linked_controller", 0, "Link", 0); - uiItemR(row, &logic_ptr, "actuators_show_active_states", 0, "State", 0); + uiItemR(row, &logic_ptr, "show_actuators_selected_objects", 0, "Sel", 0); + uiItemR(row, &logic_ptr, "show_actuators_active_object", 0, "Act", 0); + uiItemR(row, &logic_ptr, "show_actuators_linked_controller", 0, "Link", 0); + uiItemR(row, &logic_ptr, "show_actuators_active_states", 0, "State", 0); for(a=0; a<count; a++) { bActuator *act; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 08dde98b4ef..3b5dcafd90a 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -463,7 +463,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) uiBlockEndAlign(block); /* Draw type */ - uiItemR(layout, &v3dptr, "viewport_shading", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", 0); if (obedit==NULL && ((ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)))) { /* Manipulators aren't used in weight paint mode */ @@ -477,7 +477,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) row= uiLayoutRow(layout, 1); uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", 0); - uiItemR(row, &v3dptr, "pivot_point_align", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", 0); /* NDOF */ /* Not implemented yet @@ -492,7 +492,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) /* Transform widget / manipulators */ row= uiLayoutRow(layout, 1); - uiItemR(row, &v3dptr, "manipulator", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(row, &v3dptr, "use_manipulator", UI_ITEM_R_ICON_ONLY, "", 0); block= uiLayoutGetBlock(row); if(v3d->twflag & V3D_USE_MANIPULATOR) { @@ -515,9 +515,9 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) /* Layers */ if (v3d->scenelock) - uiTemplateLayers(layout, &sceneptr, "layers", &v3dptr, "used_layers", ob_lay); + uiTemplateLayers(layout, &sceneptr, "layers", &v3dptr, "layers_used", ob_lay); else - uiTemplateLayers(layout, &v3dptr, "layers", &v3dptr, "used_layers", ob_lay); + uiTemplateLayers(layout, &v3dptr, "layers", &v3dptr, "layers_used", ob_lay); /* Scene lock */ uiItemR(layout, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY, "", 0); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 2734e580782..6768141e6d9 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -218,12 +218,12 @@ void view3d_keymap(wmKeyConfig *keyconf) /* drawtype */ kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shading"); + RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shade"); RNA_string_set(kmi->ptr, "value_1", "SOLID"); RNA_string_set(kmi->ptr, "value_2", "WIREFRAME"); kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_PRESS, KM_ALT, 0); - RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shading"); + RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shade"); RNA_string_set(kmi->ptr, "value_1", "TEXTURED"); RNA_string_set(kmi->ptr, "value_2", "SOLID"); diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index 65870d54c11..38ba44f2c2b 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -90,7 +90,7 @@ extern EnumPropertyItem wm_report_items[]; extern EnumPropertyItem property_type_items[]; extern EnumPropertyItem property_unit_items[]; -extern EnumPropertyItem viewport_shading_items[]; +extern EnumPropertyItem viewport_shade_items[]; struct bContext; struct PointerRNA; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 1cec4f7124c..482cb2f574a 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2736,12 +2736,12 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "sequencer_gl_preview", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "seq_prev_type"); - RNA_def_property_enum_items(prop, viewport_shading_items); + RNA_def_property_enum_items(prop, viewport_shade_items); RNA_def_property_ui_text(prop, "Sequencer Preview Shading", "Method to draw in the sequencer view"); prop= RNA_def_property(srna, "sequencer_gl_render", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "seq_rend_type"); - RNA_def_property_enum_items(prop, viewport_shading_items); + RNA_def_property_enum_items(prop, viewport_shade_items); RNA_def_property_ui_text(prop, "Sequencer Preview Shading", "Method to draw in the sequencer view"); /* layers */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d72eb25dd2f..7b4bbd48cc4 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -89,7 +89,7 @@ EnumPropertyItem autosnap_items[] = { {SACTSNAP_MARKER, "MARKER", 0, "Nearest Marker", "Snap to nearest marker"}, {0, NULL, 0, NULL, NULL}}; -EnumPropertyItem viewport_shading_items[] = { +EnumPropertyItem viewport_shade_items[] = { {OB_BOUNDBOX, "BOUNDBOX", ICON_BBOX, "Bounding Box", "Display the object's local bounding boxes only"}, {OB_WIRE, "WIREFRAME", ICON_WIRE, "Wireframe", "Display the object as wire edges"}, {OB_SOLID, "SOLID", ICON_SOLID, "Solid", "Display the object solid, lit with default OpenGL lights"}, @@ -734,7 +734,7 @@ static void rna_def_space_image_uv(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Space UV Editor", "UV editor data for the image editor space"); /* selection */ - prop= RNA_def_property(srna, "sticky_selection_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "sticky_select_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "sticky"); RNA_def_property_enum_items(prop, sticky_mode_items); RNA_def_property_ui_text(prop, "Sticky Selection Mode", "Automatically select also UVs sharing the same vertex as the ones being selected"); @@ -747,12 +747,12 @@ static void rna_def_space_image_uv(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Edge Draw Type", "Draw type for drawing UV edges"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "draw_smooth_edges", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_smooth_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_SMOOTH_UV); RNA_def_property_ui_text(prop, "Draw Smooth Edges", "Draw UV edges anti-aliased"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "draw_stretch", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_stretch", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_STRETCH); RNA_def_property_ui_text(prop, "Draw Stretch", "Draw faces colored according to the difference in shape between UVs and their 3D coordinates (blue for low distortion, red for high distortion)"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); @@ -763,17 +763,17 @@ static void rna_def_space_image_uv(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Draw Stretch Type", "Type of stretch to draw"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "draw_modified_edges", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_modified_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAWSHADOW); RNA_def_property_ui_text(prop, "Draw Modified Edges", "Draw edges after modifiers are applied"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "draw_other_objects", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_other_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_OTHER); RNA_def_property_ui_text(prop, "Draw Other Objects", "Draw other selected objects that share the same image"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "normalized_coordinates", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_normalized_coords", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_COORDFLOATS); RNA_def_property_ui_text(prop, "Normalized Coordinates", "Display UV coordinates from 0.0 to 1.0 rather than in pixels"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); @@ -786,22 +786,22 @@ static void rna_def_space_image_uv(BlenderRNA *brna) /* todo: move edge and face drawing options here from G.f */ - prop= RNA_def_property(srna, "snap_to_pixels", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_snap_to_pixels", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_PIXELSNAP); RNA_def_property_ui_text(prop, "Snap to Pixels", "Snap UVs to pixel locations while editing"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "constrain_to_image_bounds", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_bounds", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_CLIP_UV); RNA_def_property_ui_text(prop, "Constrain to Image Bounds", "Constraint to stay within the image bounds while editing"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "live_unwrap", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_live_unwrap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_LIVE_UNWRAP); RNA_def_property_ui_text(prop, "Live Unwrap", "Continuously unwrap the selected UV island while transforming pinned vertices"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); - prop= RNA_def_property(srna, "pivot", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "pivot_point", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "around"); RNA_def_property_enum_items(prop, pivot_items); RNA_def_property_ui_text(prop, "Pivot", "Rotation/Scaling Pivot"); @@ -838,22 +838,22 @@ static void rna_def_space_outliner(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Display Mode", "Type of information to display"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); - prop= RNA_def_property(srna, "display_filter", PROP_STRING, PROP_NONE); + prop= RNA_def_property(srna, "filter_text", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "search_string"); RNA_def_property_ui_text(prop, "Display Filter", "Live search filtering string"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); - prop= RNA_def_property(srna, "match_case_sensitive", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_filter_case_sensitive", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "search_flags", SO_FIND_CASE_SENSITIVE); RNA_def_property_ui_text(prop, "Case Sensitive Matches Only", "Only use case sensitive matches of search string"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); - prop= RNA_def_property(srna, "match_complete", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_filter_complete", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "search_flags", SO_FIND_COMPLETE); RNA_def_property_ui_text(prop, "Complete Matches Only", "Only use complete matches of search string"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); - prop= RNA_def_property(srna, "show_restriction_columns", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_restrict_columns", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SO_HIDE_RESTRICTCOLS); RNA_def_property_ui_text(prop, "Show Restriction Columns", "Show column"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_OUTLINER, NULL); @@ -975,9 +975,9 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Lock Bone", "3D View center is locked to this bone's position"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "viewport_shading", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "viewport_shade", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "drawtype"); - RNA_def_property_enum_items(prop, viewport_shading_items); + RNA_def_property_enum_items(prop, viewport_shade_items); RNA_def_property_ui_text(prop, "Viewport Shading", "Method to display/shade objects in the 3D View"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); @@ -1028,52 +1028,52 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_range(prop, 1, 1024); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "display_floor", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_floor", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_FLOOR); RNA_def_property_ui_text(prop, "Display Grid Floor", "Show the ground plane grid in perspective view"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "display_x_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_axis_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_X); RNA_def_property_ui_text(prop, "Display X Axis", "Show the X axis line in perspective view"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "display_y_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_axis_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_Y); RNA_def_property_ui_text(prop, "Display Y Axis", "Show the Y axis line in perspective view"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "display_z_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_axis_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_Z); RNA_def_property_ui_text(prop, "Display Z Axis", "Show the Z axis line in perspective view"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "outline_selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_outline_selected", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_SELECT_OUTLINE); RNA_def_property_ui_text(prop, "Outline Selected", "Show an outline highlight around selected objects in non-wireframe views"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "all_object_origins", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_all_objects_origin", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_DRAW_CENTERS); RNA_def_property_ui_text(prop, "All Object Origins", "Show the object origin center dot for all (selected and unselected) objects"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "relationship_lines", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_relationship_lines", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", V3D_HIDE_HELPLINES); RNA_def_property_ui_text(prop, "Relationship Lines", "Show dashed lines indicating parent or constraint relationships"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "textured_solid", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_textured_solid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_SOLID_TEX); RNA_def_property_ui_text(prop, "Textured Solid", "Display face-assigned textures in solid view"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "display_render_override", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_only_render", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_RENDER_OVERRIDE); RNA_def_property_ui_text(prop, "Only Render", "Display only objects which will be rendered"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "occlude_geometry", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_occlude_geometry", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_ZBUF_SELECT); RNA_def_property_ui_text(prop, "Occlude Geometry", "Limit selection to visible (clipped with depth buffer)"); RNA_def_property_ui_icon(prop, ICON_ORTHO, 0); @@ -1085,7 +1085,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Background Images", "List of background images"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "display_background_images", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_background_images", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_DISPBGPICS); RNA_def_property_ui_text(prop, "Display Background Images", "Display reference images behind objects in the 3D View"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); @@ -1096,31 +1096,31 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Pivot Point", "Pivot center for rotation/scaling"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "pivot_point_align", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_pivot_point_align", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_ALIGN); RNA_def_property_ui_text(prop, "Align", "Manipulate object centers only"); 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, "manipulator", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_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); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "manipulator_translate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_manipulator_translate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_TRANSLATE); RNA_def_property_ui_text(prop, "Manipulator Translate", "Use the manipulator for movement transformations"); RNA_def_property_ui_icon(prop, ICON_MAN_TRANS, 0); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "manipulator_rotate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_manipulator_rotate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_ROTATE); RNA_def_property_ui_text(prop, "Manipulator Rotate", "Use the manipulator for rotation transformations"); RNA_def_property_ui_icon(prop, ICON_MAN_ROT, 0); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "manipulator_scale", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_manipulator_scale", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_SCALE); RNA_def_property_ui_text(prop, "Manipulator Scale", "Use the manipulator for scale transformations"); RNA_def_property_ui_icon(prop, ICON_MAN_SCALE, 0); @@ -1152,7 +1152,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Visible Layers", "Layers visible in this 3D View"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); - prop= RNA_def_property(srna, "used_layers", PROP_BOOLEAN, PROP_LAYER_MEMBER); + prop= RNA_def_property(srna, "layers_used", PROP_BOOLEAN, PROP_LAYER_MEMBER); RNA_def_property_boolean_sdna(prop, NULL, "lay_used", 1); RNA_def_property_array(prop, 20); RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -1273,7 +1273,7 @@ static void rna_def_space_buttons(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Align", "Arrangement of the panels"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_PROPERTIES, NULL); - prop= RNA_def_property(srna, "brush_texture", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_brush_texture", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SB_BRUSH_TEX); RNA_def_property_ui_text(prop, "Brush Texture", "Show brush textures"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_PROPERTIES, NULL); @@ -1325,7 +1325,7 @@ static void rna_def_space_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Scopes", "Scopes to visualize image statistics."); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, "rna_SpaceImageEditor_scopes_update"); - prop= RNA_def_property(srna, "image_pin", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_image_pin", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pin", 0); RNA_def_property_ui_text(prop, "Image Pin", "Display current image regardless of object selection"); RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1); @@ -1337,7 +1337,7 @@ static void rna_def_space_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Line sample", "Sampled colors along line"); /* image draw */ - prop= RNA_def_property(srna, "draw_repeated", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_repeat", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_TILE); RNA_def_property_ui_text(prop, "Draw Repeated", "Draw the image repeated outside of the main view"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL); @@ -1357,7 +1357,7 @@ static void rna_def_space_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "UV Editor", "UV editor settings"); /* paint */ - prop= RNA_def_property(srna, "image_painting", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_image_paint", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAWTOOL); RNA_def_property_ui_text(prop, "Image Painting", "Enable image painting mode"); RNA_def_property_ui_icon(prop, ICON_TPAINT_HLT, 0); @@ -1375,7 +1375,7 @@ static void rna_def_space_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Grease Pencil", "Display and edit the grease pencil freehand annotations overlay"); /* update */ - prop= RNA_def_property(srna, "update_automatically", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_realtime_update", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "lock", 0); RNA_def_property_ui_text(prop, "Update Automatically", "Update other affected window spaces automatically to reflect changes during interactive operations such as transform"); @@ -1445,12 +1445,12 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); /* flag's */ - prop= RNA_def_property(srna, "show_cframe_indicator", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_frame_indicator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SEQ_NO_DRAW_CFRANUM); RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); - prop= RNA_def_property(srna, "draw_frames", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_frames", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAWFRAMES); RNA_def_property_ui_text(prop, "Draw Frames", "Draw frames rather than seconds"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); @@ -1460,12 +1460,12 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Transform Markers", "Transform markers as well as strips"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); - prop= RNA_def_property(srna, "separate_color_preview", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_separate_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_COLOR_SEPERATED); RNA_def_property_ui_text(prop, "Separate Colors", "Separate color channels in preview"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); - prop= RNA_def_property(srna, "draw_safe_margin", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_safe_margin", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_SAFE_MARGINS); RNA_def_property_ui_text(prop, "Safe Margin", "Draw title safe margins in preview"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); @@ -1572,21 +1572,23 @@ static void rna_def_space_text(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL); /* functionality options */ - prop= RNA_def_property(srna, "overwrite", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_overwrite", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "overwrite", 1); RNA_def_property_ui_text(prop, "Overwrite", "Overwrite characters when typing rather than inserting them"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL); - prop= RNA_def_property(srna, "live_edit", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_live_edit", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "live_edit", 1); RNA_def_property_ui_text(prop, "Live Edit", "Run python while editing"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL); /* find */ - prop= RNA_def_property(srna, "find_all", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_find_all", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", ST_FIND_ALL); RNA_def_property_ui_text(prop, "Find All", "Search in all text datablocks, instead of only the active one"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL); - prop= RNA_def_property(srna, "find_wrap", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_find_wrap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", ST_FIND_WRAP); RNA_def_property_ui_text(prop, "Find Wrap", "Search again from the start of the file when reaching the end"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL); @@ -1640,7 +1642,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL); - prop= RNA_def_property(srna, "show_cframe_indicator", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_frame_indicator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NODRAWCFRANUM); RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL); @@ -1651,12 +1653,12 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL); /* editing */ - prop= RNA_def_property(srna, "automerge_keyframes", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_merge_keyframes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NOTRANSKEYCULL); RNA_def_property_ui_text(prop, "AutoMerge Keyframes", "Automatically merge nearby keyframes"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL); - prop= RNA_def_property(srna, "realtime_updates", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_realtime_update", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NOREALTIMEUPDATES); RNA_def_property_ui_text(prop, "Realtime Updates", "When transforming keyframes, changes to the animation data are flushed to other views"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL); @@ -1672,7 +1674,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) RNA_def_property_ui_text(prop, "DopeSheet", "Settings for filtering animation data"); /* autosnap */ - prop= RNA_def_property(srna, "autosnap", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "auto_snap", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "autosnap"); RNA_def_property_enum_items(prop, autosnap_items); RNA_def_property_ui_text(prop, "Auto Snap", "Automatic time snapping settings for transformations"); @@ -1718,7 +1720,7 @@ static void rna_def_space_graph(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); - prop= RNA_def_property(srna, "show_cframe_indicator", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_frame_indicator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NODRAWCFRANUM); RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); @@ -1733,23 +1735,23 @@ static void rna_def_space_graph(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Handles", "Show handles of Bezier control points"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); - prop= RNA_def_property(srna, "only_selected_curves_handles", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_only_selected_curves_handles", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_SELCUVERTSONLY); RNA_def_property_ui_text(prop, "Only Selected Curve Keyframes", "Only keyframes of selected F-Curves are visible and editable"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); - prop= RNA_def_property(srna, "only_selected_keyframe_handles", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_only_selected_keyframe_handles", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SIPO_SELVHANDLESONLY); RNA_def_property_ui_text(prop, "Only Selected Keyframes Handles", "Only show and edit handles of selected keyframes"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); /* editing */ - prop= RNA_def_property(srna, "automerge_keyframes", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_merge_keyframes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NOTRANSKEYCULL); RNA_def_property_ui_text(prop, "AutoMerge Keyframes", "Automatically merge nearby keyframes"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); - prop= RNA_def_property(srna, "realtime_updates", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_realtime_update", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NOREALTIMEUPDATES); RNA_def_property_ui_text(prop, "Realtime Updates", "When transforming keyframes, changes to the animation data are flushed to other views"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); @@ -1760,7 +1762,7 @@ static void rna_def_space_graph(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Cursor", "Show 2D cursor"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); - prop= RNA_def_property(srna, "cursor_value", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "cursor_position_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "cursorVal"); RNA_def_property_ui_text(prop, "Cursor Y-Value", "Graph Editor 2D-Value cursor - Y-Value component"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); @@ -1778,7 +1780,7 @@ static void rna_def_space_graph(BlenderRNA *brna) RNA_def_property_ui_text(prop, "DopeSheet", "Settings for filtering animation data"); /* autosnap */ - prop= RNA_def_property(srna, "autosnap", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "auto_snap", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "autosnap"); RNA_def_property_enum_items(prop, autosnap_items); RNA_def_property_ui_text(prop, "Auto Snap", "Automatic time snapping settings for transformations"); @@ -1808,7 +1810,7 @@ static void rna_def_space_nla(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NLA, NULL); - prop= RNA_def_property(srna, "show_cframe_indicator", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_frame_indicator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SNLA_NODRAWCFRANUM); RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NLA, NULL); @@ -1819,7 +1821,7 @@ static void rna_def_space_nla(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NLA, NULL); /* editing */ - prop= RNA_def_property(srna, "realtime_updates", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_realtime_update", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SNLA_NOREALTIMEUPDATES); RNA_def_property_ui_text(prop, "Realtime Updates", "When transforming strips, changes to the animation data are flushed to other views"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NLA, NULL); @@ -1831,7 +1833,7 @@ static void rna_def_space_nla(BlenderRNA *brna) RNA_def_property_ui_text(prop, "DopeSheet", "Settings for filtering animation data"); /* autosnap */ - prop= RNA_def_property(srna, "autosnap", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "auto_snap", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "autosnap"); RNA_def_property_enum_items(prop, autosnap_items); RNA_def_property_ui_text(prop, "Auto Snap", "Automatic time snapping settings for transformations"); @@ -1848,48 +1850,48 @@ static void rna_def_space_time(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Space Timeline Editor", "Timeline editor space data"); /* Define Anim Playback Areas */ - prop= RNA_def_property(srna, "play_top_left", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_play_top_left_3d_editor", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_REGION); RNA_def_property_ui_text(prop, "Top-Left 3D Editor", ""); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update"); - prop= RNA_def_property(srna, "play_all_3d", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_play_3d_editors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_3D_WIN); RNA_def_property_ui_text(prop, "All 3D View Editors", ""); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update"); - prop= RNA_def_property(srna, "play_anim", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_play_animation_editors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_ANIM_WIN); RNA_def_property_ui_text(prop, "Animation Editors", ""); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update"); - prop= RNA_def_property(srna, "play_buttons", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_play_properties_editors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_BUTS_WIN); RNA_def_property_ui_text(prop, "Property Editors", ""); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update"); - prop= RNA_def_property(srna, "play_image", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_play_image_editors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_ALL_IMAGE_WIN); RNA_def_property_ui_text(prop, "Image Editors", ""); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update"); - prop= RNA_def_property(srna, "play_sequencer", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_play_sequence_editors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_SEQ); RNA_def_property_ui_text(prop, "Sequencer Editors", ""); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update"); - prop= RNA_def_property(srna, "play_nodes", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_play_node_editors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "redraws", TIME_NODES); RNA_def_property_ui_text(prop, "Node Editors", ""); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, "rna_SpaceTime_redraw_update"); /* Other options */ - prop= RNA_def_property(srna, "only_selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_only_selected", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TIME_ONLYACTSEL); RNA_def_property_ui_text(prop, "Only Selected channels", "Show keyframes for active Object and/or its selected channels only"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, NULL); - prop= RNA_def_property(srna, "show_cframe_indicator", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_frame_indicator", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TIME_CFRA_NUM); RNA_def_property_ui_text(prop, "Show Frame Number Indicator", "Show frame number beside the current frame indicator line"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TIME, NULL); @@ -1968,11 +1970,11 @@ static void rna_def_space_console(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Type", "Console type"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL); - prop= RNA_def_property(srna, "selection_start", PROP_INT, PROP_UNSIGNED); /* copied from text editor */ + prop= RNA_def_property(srna, "select_start", PROP_INT, PROP_UNSIGNED); /* copied from text editor */ RNA_def_property_int_sdna(prop, NULL, "sel_start"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL); - prop= RNA_def_property(srna, "selection_end", PROP_INT, PROP_UNSIGNED); /* copied from text editor */ + prop= RNA_def_property(srna, "select_end", PROP_INT, PROP_UNSIGNED); /* copied from text editor */ RNA_def_property_int_sdna(prop, NULL, "sel_end"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE, NULL); @@ -1992,7 +1994,7 @@ static void rna_def_space_console(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Operator", "Display the operator log"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL); - prop= RNA_def_property(srna, "show_report_warn", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_report_warning", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "rpt_mask", CONSOLE_RPT_WARN); RNA_def_property_ui_text(prop, "Show Warn", "Display warnings"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL); @@ -2159,7 +2161,7 @@ static void rna_def_space_userpref(BlenderRNA *brna) RNA_def_struct_sdna(srna, "SpaceUserPref"); RNA_def_struct_ui_text(srna, "Space User Preferences", "User preferences space data"); - prop= RNA_def_property(srna, "filter", PROP_STRING, PROP_NONE); + prop= RNA_def_property(srna, "filter_text", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "filter"); RNA_def_property_ui_text(prop, "Filter", "Search term for filtering in the UI"); @@ -2211,7 +2213,7 @@ static void rna_def_space_node(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Node Tree", "Node tree being displayed and edited"); - prop= RNA_def_property(srna, "backdrop", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_backdrop", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_BACKDRAW); RNA_def_property_ui_text(prop, "Backdrop", "Use active Viewer Node output as backdrop for compositing nodes"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NODE_VIEW, NULL); @@ -2227,59 +2229,59 @@ static void rna_def_space_logic(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Space Logic Editor", "Logic editor space data"); /* sensors */ - prop= RNA_def_property(srna, "sensors_show_selected_objects", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_sensors_selected_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_SENS_SEL); RNA_def_property_ui_text(prop, "Show Selected Object", "Show sensors of all selected objects"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "sensors_show_active_objects", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_sensors_active_object", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_SENS_ACT); RNA_def_property_ui_text(prop, "Show Active Object", "Show sensors of active object"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "sensors_show_linked_controller", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_sensors_linked_controller", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_SENS_LINK); RNA_def_property_ui_text(prop, "Show Linked to Controller", "Show linked objects to the controller"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "sensors_show_active_states", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_sensors_active_states", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_SENS_STATE); RNA_def_property_ui_text(prop, "Show Active States", "Show only sensors connected to active states"); RNA_def_property_update(prop, NC_LOGIC, NULL); /* controllers */ - prop= RNA_def_property(srna, "controllers_show_selected_objects", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_controllers_selected_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_CONT_SEL); RNA_def_property_ui_text(prop, "Show Selected Object", "Show controllers of all selected objects"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "controllers_show_active_objects", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_controllers_active_object", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_CONT_ACT); RNA_def_property_ui_text(prop, "Show Active Object", "Show controllers of active object"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "controllers_show_linked_controller", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_controllers_linked_controller", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_CONT_LINK); RNA_def_property_ui_text(prop, "Show Linked to Controller", "Show linked objects to sensor/actuator"); RNA_def_property_update(prop, NC_LOGIC, NULL); /* actuators */ - prop= RNA_def_property(srna, "actuators_show_selected_objects", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_actuators_selected_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_ACT_SEL); RNA_def_property_ui_text(prop, "Show Selected Object", "Show actuators of all selected objects"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "actuators_show_active_objects", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_actuators_active_object", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_ACT_ACT); RNA_def_property_ui_text(prop, "Show Active Object", "Show actuators of active object"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "actuators_show_linked_controller", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_actuators_linked_controller", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_ACT_LINK); RNA_def_property_ui_text(prop, "Show Linked to Actuator", "Show linked objects to the actuator"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "actuators_show_active_states", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_actuators_active_states", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", BUTS_ACT_STATE); RNA_def_property_ui_text(prop, "Show Active States", "Show only actuators connected to active states"); RNA_def_property_update(prop, NC_LOGIC, NULL); diff --git a/source/blender/makesrna/rna_cleanup/rna_properties.txt b/source/blender/makesrna/rna_cleanup/rna_properties.txt index 6b13505d155..af9ec148382 100644 --- a/source/blender/makesrna/rna_cleanup/rna_properties.txt +++ b/source/blender/makesrna/rna_cleanup/rna_properties.txt @@ -1983,7 +1983,7 @@ TODO MOVE TO COLLECTION * KeyingSet.active_path -> active_path: pointer "Acti + * KeyingSet.insertkey_needed -> use_insertkey_needed: boolean "Only insert keyframes where theyre needed in the relevant F-Curves" + * KeyingSet.insertkey_visual -> use_insertkey_visual: boolean "Insert keyframes based on visual transforms" + * KeyingSet.insertkey_xyz_to_rgb -> use_insertkey_xyz_to_rgb: boolean "Color for newly added transformation F-Curves (Location, Rotation, Scale) and also Color is based on the transform axis" -+ * KeyingSet.absolute -> use_path_absolute: boolean "Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info)" ++ * KeyingSet.absolute -> is_path_absolute: boolean "Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info)" + * KeyingSetInfo.bl_idname -> bl_idname: string "NO DESCRIPTION" + * KeyingSetInfo.bl_label -> bl_label: string "NO DESCRIPTION" + * KeyingSetInfo.insertkey_needed -> use_insertkey_needed: boolean "Only insert keyframes where theyre needed in the relevant F-Curves" |