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:
authorPhilipp Oeser <info@graphics-engineer.com>2020-01-30 12:54:58 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-01-30 13:08:03 +0300
commit78872b33600ed68ca1aa5295b5c9df3cc79a1da2 (patch)
tree6a0882ed5fa2407ae1795362ed81cf388db8db0b
parent306edb7477803c10b3992bf76f94fdfcfa8037f8 (diff)
Fix T73499: Crash on hiding parent and all children of an object if one child is in an excluded collection
Dont act on a base which cannot be found in the viewlayer. Oversight in rB41858a73111d. Maniphest Tasks: T73499 Differential Revision: https://developer.blender.org/D6721
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 2c2989a284d..a341be5bf65 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -295,6 +295,10 @@ static void outliner_object_set_flag_recursive_cb(bContext *C,
}
else {
Base *base_iter = BKE_view_layer_base_find(view_layer, ob_iter);
+ /* Child can be in a collection excluded from viewlayer. */
+ if (base_iter == NULL) {
+ continue;
+ }
RNA_pointer_create(&scene->id, &RNA_ObjectBase, base_iter, &ptr);
}
RNA_property_boolean_set(&ptr, base_or_object_prop, value);