diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-02-16 18:02:30 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-02-16 18:02:30 +0300 |
| commit | 5d0bd68cc06897c7e62988abe26268783cfb1bb9 (patch) | |
| tree | 6642554c8927280a8ba49bd9c329f2a133afa60a /source/blender/draw/engines/workbench/shaders | |
| parent | 6d89120248f3dd24d2090814b29af0ca12d5d7c6 (diff) | |
| parent | 5b3a415a59cef7183a2539fcc12de8fd1ebf8814 (diff) | |
Merge branch 'master' into bli-math-basic-typesbli-math-basic-types
Diffstat (limited to 'source/blender/draw/engines/workbench/shaders')
| -rw-r--r-- | source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl index e9525ce9de0..d8f8a1cc03f 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl @@ -254,31 +254,8 @@ void main() * Morgan McGuire and Kyle Whitson * http://graphics.cs.williams.edu * - * - * Copyright (c) Morgan McGuire and Williams College, 2006 - * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause + * Copyright 2006 Morgan McGuire and Williams College, All rights reserved. */ #ifdef BLUR2 |