[Bf-blender-cvs] [54ea3562406] blender-v2.83-release: Cleanup: remove redundant active object NULL check & poll
Campbell Barton
noreply at git.blender.org
Wed May 13 15:15:10 CEST 2020
Commit: 54ea3562406c633dc69f59697cca3cd1cded3bcd
Author: Campbell Barton
Date: Wed May 13 22:58:23 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB54ea3562406c633dc69f59697cca3cd1cded3bcd
Cleanup: remove redundant active object NULL check & poll
This was from 66da2f537ae80 but never did anything,
as a NULL object always exited at the beginning of the operator.
===================================================================
M source/blender/editors/object/object_edit.c
===================================================================
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 5506895613b..6929930c26c 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1391,35 +1391,20 @@ static const EnumPropertyItem *object_mode_set_itemsf(bContext *C,
return item;
}
-static bool object_mode_set_poll(bContext *C)
-{
- /* Since Grease Pencil editmode is also handled here,
- * we have a special exception for allowing this operator
- * to still work in that case when there's no active object
- * so that users can exit editmode this way as per normal.
- */
- if (ED_operator_object_active_editable(C)) {
- return true;
- }
- else {
- return (CTX_data_gpencil_data(C) != NULL);
- }
-}
-
static int object_mode_set_exec(bContext *C, wmOperator *op)
{
bool use_submode = STREQ(op->idname, "OBJECT_OT_mode_set_with_submode");
Object *ob = CTX_data_active_object(C);
eObjectMode mode = RNA_enum_get(op->ptr, "mode");
- eObjectMode restore_mode = (ob) ? ob->mode : OB_MODE_OBJECT;
+ eObjectMode restore_mode = ob->mode;
const bool toggle = RNA_boolean_get(op->ptr, "toggle");
/* by default the operator assume is a mesh, but if gp object change mode */
- if ((ob != NULL) && (ob->type == OB_GPENCIL) && (mode == OB_MODE_EDIT)) {
+ if ((ob->type == OB_GPENCIL) && (mode == OB_MODE_EDIT)) {
mode = OB_MODE_EDIT_GPENCIL;
}
- if (!ob || !ED_object_mode_compat_test(ob, mode)) {
+ if (!ED_object_mode_compat_test(ob, mode)) {
return OPERATOR_PASS_THROUGH;
}
@@ -1450,7 +1435,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
}
/* if type is OB_GPENCIL, set cursor mode */
- if ((ob) && (ob->type == OB_GPENCIL)) {
+ if (ob->type == OB_GPENCIL) {
if (ob->data) {
bGPdata *gpd = (bGPdata *)ob->data;
ED_gpencil_setup_modes(C, gpd, ob->mode);
@@ -1485,8 +1470,7 @@ void OBJECT_OT_mode_set(wmOperatorType *ot)
/* api callbacks */
ot->exec = object_mode_set_exec;
-
- ot->poll = object_mode_set_poll; // ED_operator_object_active_editable;
+ ot->poll = ED_operator_object_active_editable;
/* flags */
ot->flag = 0; /* no register/undo here, leave it to operators being called */
More information about the Bf-blender-cvs
mailing list