From 85d469124a2f332fdf434dcffd2226319dddf6c6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 10 Feb 2022 23:47:44 +1100 Subject: Rebase on master --- source/blender/io/usd/intern/usd_reader_camera.h | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'source/blender/io/usd/intern/usd_reader_camera.h') diff --git a/source/blender/io/usd/intern/usd_reader_camera.h b/source/blender/io/usd/intern/usd_reader_camera.h index a4156aa8be2..d7a742bdbad 100644 --- a/source/blender/io/usd/intern/usd_reader_camera.h +++ b/source/blender/io/usd/intern/usd_reader_camera.h @@ -1,23 +1,6 @@ -/* - * 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 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * +/* SPDX-License-Identifier: GPL-2.0-or-later * Adapted from the Blender Alembic importer implementation. - * - * Modifications Copyright (C) 2021 Tangent Animation. - * All rights reserved. - */ + * Modifications Copyright 2021 Tangent Animation. All rights reserved. */ #pragma once #include "usd.h" -- cgit v1.2.3