[Bf-blender-cvs] [03c8b048a16] master: Cleanup: remove public unused function.

[Bastien Montagne]

Commit: 03c8b048a166584a72ceff08432401cd7047648c
Author: Bastien Montagne
Date:   Mon Jul 13 14:15:57 2020 +0200
Branches: master
https://developer.blender.org/rB03c8b048a166584a72ceff08432401cd7047648c

Cleanup: remove public unused function.

===================================================================

M	source/blender/editors/include/ED_screen.h
M	source/blender/editors/object/object_edit.c
M	source/blender/editors/screen/screen_ops.c

===================================================================

diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index bc6a4b23609..43f3a578bfe 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -347,7 +347,6 @@ bool ED_operator_info_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_editable_ex(struct bContext *C, const Object *ob);
 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_font(struct bContext *C);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 04113f70e52..49d80bc15ee 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1463,13 +1463,6 @@ static const EnumPropertyItem *object_mode_set_itemsf(bContext *C,
   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)
 {
   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 */
   ot->exec = object_mode_set_exec;
-  ot->poll = object_mode_set_poll;
+  ot->poll = ED_operator_object_active_editable;
 
   /* flags */
   ot->flag = 0; /* no register/undo here, leave it to operators being called */
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index f32dd0c8703..cd612c35a36 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -349,7 +349,7 @@ bool ED_operator_object_active(bContext *C)
   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));
 }
@@ -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)
 {
   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)