diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-02 10:28:54 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-02 10:28:54 +0300 |
| commit | 34e8d79c3edbc58fd242cec0c1f2bed4e43855af (patch) | |
| tree | 36c70e63515af2bd8ea840102493028faec37971 /source/blender/editors/space_outliner/outliner_collections.c | |
| parent | 465fb31ed275618ec71e4925ab94bd4a9b077a12 (diff) | |
| parent | 48722e8971133dbe14ecc6825a2451637df77eab (diff) | |
Merge branch 'master' into cycles_texture_cache
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_collections.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 062d2e2b5d1..6538f5709b7 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -912,10 +912,9 @@ static int collection_view_layer_exec(bContext *C, wmOperator *op) .space_outliner = space_outliner, }; bool clear = strstr(op->idname, "clear") != NULL; - int flag = strstr(op->idname, "holdout") ? - LAYER_COLLECTION_HOLDOUT : - strstr(op->idname, "indirect_only") ? LAYER_COLLECTION_INDIRECT_ONLY : - LAYER_COLLECTION_EXCLUDE; + int flag = strstr(op->idname, "holdout") ? LAYER_COLLECTION_HOLDOUT : + strstr(op->idname, "indirect_only") ? LAYER_COLLECTION_INDIRECT_ONLY : + LAYER_COLLECTION_EXCLUDE; data.collections_to_edit = BLI_gset_ptr_new(__func__); |