Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/blender-v2.83-release'

Browse Source
This commit is contained in:
Sybren A. Stüvel
2020-05-15 12:59:24 +02:00
parent 5f95912afc 0ae64a9945
commit 04517ee936
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_time.py
View File

@@ -142,6 +142,7 @@ class TIME_MT_view(Menu):
layout.separator() layout.separator()
layout.prop(scene, "show_keys_from_selected_only") layout.prop(scene, "show_keys_from_selected_only")
layout.prop(st.dopesheet, "show_only_errors")
layout.separator() layout.separator()

3
source/blender/io/alembic/intern/abc_writer_mesh.cc
View File

@@ -137,7 +137,8 @@ static void get_loop_normals(struct Mesh *mesh,
/* If all polygons are smooth shaded, and there are no custom normals, we don't need to export /* If all polygons are smooth shaded, and there are no custom normals, we don't need to export
* normals at all. This is also done by other software, see T71246. */ * normals at all. This is also done by other software, see T71246. */
if (!has_flat_shaded_poly && !CustomData_has_layer(&mesh->ldata, CD_CUSTOMLOOPNORMAL)) { if (!has_flat_shaded_poly && !CustomData_has_layer(&mesh->ldata, CD_CUSTOMLOOPNORMAL) &&
(mesh->flag & ME_AUTOSMOOTH) == 0) {
return; return;
} }