Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-04-30 08:15:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-04-30 08:15:14 +0300
commit0959618c2e5f31a8e5df3967dacdba1a6f6f9854 (patch)
treea0bc2a2fe889243e89de11daa9d8849022ccbba6 /source/blender/editors/object
parent1597eb82d6507a8186f694cf79c9eea3138e4ae8 (diff)
parentc195c061d59b59283077328bdf0931d45fef76d0 (diff)
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_add.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 840fd97cc48..1158676c28c 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -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! */