[Bf-blender-cvs] [0622d2ec611] blender-v3.1-release: Fix T95815: missing null check when computing dupli dimensions
Jacques Lucke
noreply at git.blender.org
Wed Feb 16 19:02:24 CET 2022
Commit: 0622d2ec611dbd68fe4105f507f639e3e34c13f6
Author: Jacques Lucke
Date: Wed Feb 16 18:58:01 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB0622d2ec611dbd68fe4105f507f639e3e34c13f6
Fix T95815: missing null check when computing dupli dimensions
Some instances might be "empty" and therefore have no dimensions.
Those should be ignored here.
===================================================================
M source/blender/blenkernel/intern/object.cc
===================================================================
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 {
More information about the Bf-blender-cvs
mailing list