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 /source/blender/editors | |
parent | 40bf37e3b661cf7675cbd578391c379332522c40 (diff) |
apply all rna naming changes for rna_space.c
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 26 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 4 |
3 files changed, 20 insertions, 20 deletions
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"); |