diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-13 16:44:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-13 16:44:13 +0300 |
| commit | 37d8d4787cfa3d04b09f935c5600f1a3ea7b74e7 (patch) | |
| tree | b60dfc428ccd61b5b3af6a06cee6ddbe69d3973e /source/blender/editors/object | |
| parent | 9abacf38fd4f3b0de4b6d9a4644b9cb1155482c9 (diff) | |
| parent | 6f633dec5d105ad91dcb5774a6fd4fb06bf264a5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index eb2d1117f1e..0a4989ebad4 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -627,7 +627,9 @@ static Mesh *bake_mesh_new_from_object(EvaluationContext *eval_ctx, Main *bmain, ED_object_editmode_load(ob); Mesh *me = BKE_mesh_new_from_object(eval_ctx, bmain, scene, ob, 1, 2, 0, 0); - BKE_mesh_split_faces(me, true); + if (me->flag & ME_AUTOSMOOTH) { + BKE_mesh_split_faces(me, true); + } return me; } |