diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-08 13:43:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-08 13:43:37 +0300 |
| commit | 127d515f3d3309b4b9311978b0bcddaa28c65cf5 (patch) | |
| tree | ccd8e445ab439d0650c557f62a92fe804beac48b /source/blender/editors/object/object_bake_api.c | |
| parent | 345c6298e995ea618c34282ba6d7ab5af032f191 (diff) | |
| parent | 1ddd03b793f6856a1278f3d8a32baca318896dfe (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_bake_api.c')
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 50922be76eb..c8bcc9224e9 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -623,9 +623,7 @@ static size_t initialize_internal_images(BakeImages *bake_images, ReportList *re /* create new mesh with edit mode changes and modifiers applied */ static Mesh *bake_mesh_new_from_object(EvaluationContext *eval_ctx, Main *bmain, Scene *scene, Object *ob) { - if (eval_ctx->object_mode & OB_MODE_EDIT) { - ED_object_editmode_load(ob); - } + ED_object_editmode_load(ob); Mesh *me = BKE_mesh_new_from_object(eval_ctx, bmain, scene, ob, 1, 2, 0, 0); if (me->flag & ME_AUTOSMOOTH) { |