diff options
| author | Jacques Lucke <mail@jlucke.com> | 2020-02-02 12:40:56 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2020-02-02 12:40:56 +0300 |
| commit | a20c78134359283606b2081a07b0e851d0246be5 (patch) | |
| tree | 8107470f757bf6e950ce497a6f4ec8f060921300 /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | 599e8f7bb10d7aeeab2060f0b6124f11e9944f91 (diff) | |
| parent | 0a09fe7831395258461a78ebd2f0900036a17827 (diff) | |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 4 |
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 17088b0e2b4..0907f159c85 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); |