archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove NULL checks from object mode switching take #2

Browse Source 
Re-apply changes from 54ea356240,
with a poll function that uses the same active object as the operator,
matching other mode switching functions.
This commit is contained in:
Campbell Barton
2020-05-18 17:04:48 +10:00
parent ff144edd8c
commit 2a3797b109
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,6 +347,7 @@ 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);

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

@@ -1393,17 +1393,9 @@ static const EnumPropertyItem *object_mode_set_itemsf(bContext *C,
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);
}
/* 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)
@@ -1411,15 +1403,15 @@ 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;
}
@@ -1456,7 +1448,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);
@@ -1491,8 +1483,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 = object_mode_set_poll;
/* flags */
ot->flag = 0; /* no register/undo here, leave it to operators being called */

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

@@ -339,7 +339,7 @@ bool ED_operator_console_active(bContext *C)
return ed_spacetype_test(C, SPACE_CONSOLE);
}
static bool ed_object_hidden(Object *ob)
static bool ed_object_hidden(const Object *ob)
{
/* if hidden but in edit mode, we still display, can happen with animation */
return ((ob->restrictflag & OB_RESTRICT_VIEWPORT) && !(ob->mode & OB_MODE_EDIT));
@@ -351,10 +351,15 @@ bool ED_operator_object_active(bContext *C)
return ((ob != NULL) && !ed_object_hidden(ob));
}
bool ED_operator_object_active_editable_ex(bContext *C, const Object *ob)
{
return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob));
}
bool ED_operator_object_active_editable(bContext *C)
{
Object *ob = ED_object_active_context(C);
return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob));
return ED_operator_object_active_editable_ex(C, ob);
}
bool ED_operator_object_active_editable_mesh(bContext *C)