Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove public unused function.

Browse Source
This commit is contained in:
Bastien Montagne
2020-07-13 14:15:57 +02:00
parent 9c9eb03d78
commit 03c8b048a1
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/ED_screen.h
View File

@@ -347,7 +347,6 @@ bool ED_operator_info_active(struct bContext *C);
bool ED_operator_console_active(struct bContext *C); bool ED_operator_console_active(struct bContext *C);
bool ED_operator_object_active(struct bContext *C); bool ED_operator_object_active(struct bContext *C);
bool ED_operator_object_active_editable_ex(struct bContext *C, const Object *ob);
bool ED_operator_object_active_editable(struct bContext *C); bool ED_operator_object_active_editable(struct bContext *C);
bool ED_operator_object_active_editable_mesh(struct bContext *C); bool ED_operator_object_active_editable_mesh(struct bContext *C);
bool ED_operator_object_active_editable_font(struct bContext *C); bool ED_operator_object_active_editable_font(struct bContext *C);

9
source/blender/editors/object/object_edit.c
View File

@@ -1463,13 +1463,6 @@ static const EnumPropertyItem *object_mode_set_itemsf(bContext *C,
return item; return item;
} }
static bool object_mode_set_poll(bContext *C)
{
/* Needed as #ED_operator_object_active_editable doesn't call use 'active_object'. */
Object *ob = CTX_data_active_object(C);
return ED_operator_object_active_editable_ex(C, ob);
}
static int object_mode_set_exec(bContext *C, wmOperator *op) static int object_mode_set_exec(bContext *C, wmOperator *op)
{ {
const bool use_submode = STREQ(op->idname, "OBJECT_OT_mode_set_with_submode"); const bool use_submode = STREQ(op->idname, "OBJECT_OT_mode_set_with_submode");
@@ -1574,7 +1567,7 @@ void OBJECT_OT_mode_set(wmOperatorType *ot)
/* api callbacks */ /* api callbacks */
ot->exec = object_mode_set_exec; ot->exec = object_mode_set_exec;
ot->poll = object_mode_set_poll; ot->poll = ED_operator_object_active_editable;
/* flags */ /* flags */
ot->flag = 0; /* no register/undo here, leave it to operators being called */ ot->flag = 0; /* no register/undo here, leave it to operators being called */

4
source/blender/editors/screen/screen_ops.c
View File

@@ -349,7 +349,7 @@ bool ED_operator_object_active(bContext *C)
return ((ob != NULL) && !ed_object_hidden(ob)); return ((ob != NULL) && !ed_object_hidden(ob));
} }
bool ED_operator_object_active_editable_ex(bContext *UNUSED(C), const Object *ob) static bool operator_object_active_editable_ex(const Object *ob)
{ {
return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob)); return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob));
} }
@@ -357,7 +357,7 @@ bool ED_operator_object_active_editable_ex(bContext *UNUSED(C), const Object *ob
bool ED_operator_object_active_editable(bContext *C) bool ED_operator_object_active_editable(bContext *C)
{ {
Object *ob = ED_object_active_context(C); Object *ob = ED_object_active_context(C);
return ED_operator_object_active_editable_ex(C, ob); return operator_object_active_editable_ex(ob);
} }
bool ED_operator_object_active_editable_mesh(bContext *C) bool ED_operator_object_active_editable_mesh(bContext *C)