blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Rename OUTLINER_OT_collection_object_remove > _object_remove_from_collection 

Better make it clear it is different than OUTLINER_OT_collection_objects_remove.
This commit is contained in:
Dalai Felinto 2018-02-06 13:28:37 -02:00
parent 9631c1ac1a
commit fcb430afba
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_outliner.py
View File

@ -235,7 +235,7 @@ class OUTLINER_MT_context_object(Menu):
layout.operator("outliner.object_operation", text="Remap Users").type='REMAP'
layout.operator("outliner.object_operation", text="Rename").type='RENAME'
layout.separator()
layout.operator("outliner.collection_object_remove", text="Remove from Collection")
layout.operator("outliner.object_remove_from_collection", text="Remove from Collection")
classes = (

12
source/blender/editors/space_outliner/outliner_collections.c
View File

@ -564,7 +564,7 @@ void OUTLINER_OT_collection_objects_remove(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
static int collection_object_remove_poll(bContext *C)
static int object_collection_remove_poll(bContext *C)
{
SpaceOops *so = CTX_wm_space_outliner(C);
if (so == NULL) {
@ -580,7 +580,7 @@ static int collection_object_remove_poll(bContext *C)
return ELEM(so->outlinevis, SO_VIEW_LAYER, SO_COLLECTIONS, SO_GROUPS);
}
static int collection_object_remove_exec(bContext *C, wmOperator *UNUSED(op))
static int object_collection_remove_exec(bContext *C, wmOperator *UNUSED(op))
{
SpaceOops *soops = CTX_wm_space_outliner(C);
Main *bmain = CTX_data_main(C);
@ -623,16 +623,16 @@ static int collection_object_remove_exec(bContext *C, wmOperator *UNUSED(op))
return OPERATOR_FINISHED;
}
void OUTLINER_OT_collection_object_remove(wmOperatorType *ot)
void OUTLINER_OT_object_remove_from_collection(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Remove Object from Collection";
ot->idname = "OUTLINER_OT_collection_object_remove";
ot->idname = "OUTLINER_OT_object_remove_from_collection";
ot->description = "Remove selected objects from their respective collection";
/* api callbacks */
ot->exec = collection_object_remove_exec;
ot->poll = collection_object_remove_poll;
ot->exec = object_collection_remove_exec;
ot->poll = object_collection_remove_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;

2
source/blender/editors/space_outliner/outliner_intern.h
View File

@ -354,9 +354,9 @@ void OUTLINER_OT_collection_link(struct wmOperatorType *ot);
void OUTLINER_OT_collection_unlink(struct wmOperatorType *ot);
void OUTLINER_OT_collection_new(struct wmOperatorType *ot);
void OUTLINER_OT_collection_duplicate(struct wmOperatorType *ot);
void OUTLINER_OT_collection_object_remove(struct wmOperatorType *ot);
void OUTLINER_OT_collection_objects_remove(struct wmOperatorType *ot);
void OUTLINER_OT_collection_objects_select(struct wmOperatorType *ot);
void OUTLINER_OT_object_remove_from_collection(struct wmOperatorType *ot);
void OUTLINER_OT_collection_objects_add(struct wmOperatorType *ot);
void OUTLINER_OT_collection_nested_new(struct wmOperatorType *ot);

2
source/blender/editors/space_outliner/outliner_ops.c
View File

@ -479,9 +479,9 @@ void outliner_operatortypes(void)
WM_operatortype_append(OUTLINER_OT_collection_nested_new);
WM_operatortype_append(OUTLINER_OT_collection_delete_selected);
WM_operatortype_append(OUTLINER_OT_collection_objects_add);
WM_operatortype_append(OUTLINER_OT_collection_object_remove);
WM_operatortype_append(OUTLINER_OT_collection_objects_remove);
WM_operatortype_append(OUTLINER_OT_collection_objects_select);
WM_operatortype_append(OUTLINER_OT_object_remove_from_collection);
}
static wmKeyMap *outliner_item_drag_drop_modal_keymap(wmKeyConfig *keyconf)