diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-02-10 18:59:57 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-02-10 18:59:57 +0300 |
| commit | a7ae33202fa94a52235fbe595873d81e482d5f58 (patch) | |
| tree | c075afc26803edd25de9021d3190d2d9613f741d /source/blender/compositor/operations/COM_SMAAOperation.h | |
| parent | a5cddaefd344a4ab8c1d5d1be39edf6e6dc456e0 (diff) | |
| parent | ad77b52abcbd0daf0d1a3ad395983cb90beeb72a (diff) | |
Merge branch 'master' into greasepencil-objectgreasepencil-object
Conflicts:
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/BKE_gpencil_update_cache.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/gpencil_update_cache.c
source/blender/blenlib/BLI_listbase.h
source/blender/blenlib/intern/DLRB_tree.c
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc
source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h
source/blender/makesdna/DNA_gpencil_types.h
source/blender/makesrna/intern/rna_gpencil.c
Diffstat (limited to 'source/blender/compositor/operations/COM_SMAAOperation.h')
| -rw-r--r-- | source/blender/compositor/operations/COM_SMAAOperation.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_SMAAOperation.h b/source/blender/compositor/operations/COM_SMAAOperation.h index ec04594e0aa..bac33f0a2b4 100644 --- a/source/blender/compositor/operations/COM_SMAAOperation.h +++ b/source/blender/compositor/operations/COM_SMAAOperation.h @@ -1,6 +1,4 @@ /* - * Copyright 2017, Blender Foundation. - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -15,7 +13,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Contributor: IRIE Shinsuke + * Copyright 2017, Blender Foundation. */ #pragma once |