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:
authorJacques Lucke <jacques@blender.org>2022-02-16 20:58:01 +0300
committerJacques Lucke <jacques@blender.org>2022-02-16 20:58:01 +0300
commit0622d2ec611dbd68fe4105f507f639e3e34c13f6 (patch)
treee508e6f5a9d48ca210ec850b7a1da930a1ec788d /source/blender/blenkernel
parent257ba175fa7e324792ce5f32d5369bcd685b8f55 (diff)
Fix T95815: missing null check when computing dupli dimensions
Some instances might be "empty" and therefore have no dimensions. Those should be ignored here.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/object.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index f9484205ef6..6dc6e37de27 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -4185,7 +4185,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 {