Merge branch 'blender-v2.93-release'

This commit is contained in:
Campbell Barton 2021-04-30 15:15:14 +10:00
commit 0959618c2e
1 changed files with 1 additions and 3 deletions

View File

@ -482,9 +482,7 @@ bool ED_object_add_generic_get_opts(bContext *C,
if (local_view_bits) {
View3D *v3d = CTX_wm_view3d(C);
if (v3d && v3d->localvd) {
*local_view_bits = v3d->local_view_uuid;
}
*local_view_bits = (v3d && v3d->localvd) ? v3d->local_view_uuid : 0;
}
/* Location! */