diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-02-16 21:03:00 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-02-16 21:03:00 +0300 |
| commit | f38c2fbef99d93721feec8819513b63c91ac796a (patch) | |
| tree | 2ad3cb4fee2f653c3617ffc4532fe3da6a4afe62 /source | |
| parent | c324cf153924ae2ec5b7c59eabff71652847aeae (diff) | |
| parent | 0622d2ec611dbd68fe4105f507f639e3e34c13f6 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/object.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index a381fe2c2ff..c5d1853ba6c 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -3936,7 +3936,7 @@ bool BKE_object_minmax_dupli(Depsgraph *depsgraph, ListBase *lb = object_duplilist(depsgraph, scene, ob); LISTBASE_FOREACH (DupliObject *, dob, lb) { - if ((use_hidden == false) && (dob->no_draw != 0)) { + if (((use_hidden == false) && (dob->no_draw != 0)) || dob->ob_data == nullptr) { /* pass */ } else { |