diff options
author | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
---|---|---|
committer | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
commit | 5a17c9bcbca737525fa535ceb45f9769a34a4df7 (patch) | |
tree | c7867d25494d053d11837d04b1ab8b86526a189d /source/blender/editors/space_outliner/outliner_edit.c | |
parent | 9887b38692e3bcf7ba613ca947fd76e299c58cbd (diff) | |
parent | 20046defd735684a42750c4cb68d20d78ad5180c (diff) |
Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_edit.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 990d50ae42a..1c78931b449 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -242,7 +242,7 @@ static int outliner_item_openclose(bContext *C, wmOperator *op, const wmEvent *e void OUTLINER_OT_item_openclose(wmOperatorType *ot) { - ot->name = "Open/Close Item"; + ot->name = "Open/Close"; ot->idname = "OUTLINER_OT_item_openclose"; ot->description = "Toggle whether item under cursor is enabled or closed"; @@ -399,7 +399,7 @@ static int outliner_item_rename(bContext *C, wmOperator *op, const wmEvent *even void OUTLINER_OT_item_rename(wmOperatorType *ot) { - ot->name = "Rename Item"; + ot->name = "Rename"; ot->idname = "OUTLINER_OT_item_rename"; ot->description = "Rename item under cursor"; @@ -1385,7 +1385,7 @@ void OUTLINER_OT_show_hierarchy(wmOperatorType *ot) /* KeyingSet and Driver Creation - Helper functions */ /* specialized poll callback for these operators to work in Datablocks view only */ -static int ed_operator_outliner_datablocks_active(bContext *C) +static bool ed_operator_outliner_datablocks_active(bContext *C) { ScrArea *sa = CTX_wm_area(C); if ((sa) && (sa->spacetype == SPACE_OUTLINER)) { @@ -1873,7 +1873,7 @@ void OUTLINER_OT_keyingset_remove_selected(wmOperatorType *ot) /* ************************************************************** */ /* ORPHANED DATABLOCKS */ -static int ed_operator_outliner_id_orphans_active(bContext *C) +static bool ed_operator_outliner_id_orphans_active(bContext *C) { ScrArea *sa = CTX_wm_area(C); if ((sa) && (sa->spacetype == SPACE_OUTLINER)) { @@ -2110,7 +2110,7 @@ void OUTLINER_OT_parent_drop(wmOperatorType *ot) RNA_def_enum(ot->srna, "type", prop_make_parent_types, 0, "Type", ""); } -static int outliner_parenting_poll(bContext *C) +static bool outliner_parenting_poll(bContext *C) { SpaceOops *soops = CTX_wm_space_outliner(C); |