diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-08-01 18:05:53 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-08-01 18:05:53 +0300 |
| commit | 03bbd5f9dedf7b3dfea7119c172c61f0b50ae28c (patch) | |
| tree | 79ab34e79af6a700c6f73f331e4ee4e253ab3751 /source/blender/editors/object/object_intern.h | |
| parent | 2204bfcf9e1c3a38e60830bd97775dd72158f4d6 (diff) | |
| parent | 49b2162309da6abf66764d41d9fc4c45ad01936c (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Diffstat (limited to 'source/blender/editors/object/object_intern.h')
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index b9350052093..e697c25b37f 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -137,7 +137,10 @@ void COLLECTION_OT_objects_add_active(struct wmOperatorType *ot); void COLLECTION_OT_objects_remove_active(struct wmOperatorType *ot); /* object_modifier.c */ -bool edit_modifier_poll_generic(struct bContext *C, struct StructRNA *rna_type, int obtype_flag); +bool edit_modifier_poll_generic(struct bContext *C, + struct StructRNA *rna_type, + int obtype_flag, + const bool is_editmode_allowed); bool edit_modifier_poll(struct bContext *C); void edit_modifier_properties(struct wmOperatorType *ot); int edit_modifier_invoke_properties(struct bContext *C, struct wmOperator *op); |