diff options
author | Bastien Montagne <b.mont29@gmail.com> | 2020-02-24 17:01:34 +0300 |
---|---|---|
committer | Bastien Montagne <b.mont29@gmail.com> | 2020-02-24 17:02:52 +0300 |
commit | 14856e149ff5c225ffe5a4022794cd12f7632f71 (patch) | |
tree | 362849e6b4784229fad598d07e23878a372fdc84 /source/blender/editors/include | |
parent | f01617bb157e76a7c70daafdbee6ab16395f737b (diff) |
Fix T74099: Can`t apply modifier, if mesh have fake user.
Also cleaned up code there, making a proper poll function for the apply
modifier operator, that way button is properly disabled in UI itself in
most invalid situations.
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_object.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index a3b7d6bd1c1..cad8b34557f 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -362,13 +362,13 @@ int ED_object_modifier_convert(struct ReportList *reports, struct ViewLayer *view_layer, struct Object *ob, struct ModifierData *md); -int ED_object_modifier_apply(struct Main *bmain, - struct ReportList *reports, - struct Depsgraph *depsgraph, - struct Scene *scene, - struct Object *ob, - struct ModifierData *md, - int mode); +bool ED_object_modifier_apply(struct Main *bmain, + struct ReportList *reports, + struct Depsgraph *depsgraph, + struct Scene *scene, + struct Object *ob, + struct ModifierData *md, + int mode); int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struct ModifierData *md); |