From 4b501431fec2fb0049d24edde8ff400d408ce7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A4r=20Winzell?= Date: Fri, 3 May 2019 16:13:18 -0700 Subject: [PATCH] License -> BSD (#186) Relicense FBX2glTF as BSD. --- CMakeLists.txt | 12 +++---- FindFBX.cmake | 23 +++++-------- LICENSE | 2 +- PATENTS | 33 ------------------- README.md | 5 ++- npm/fbx2gltf/LICENSE | 2 +- npm/fbx2gltf/PATENTS | 33 ------------------- npm/fbx2gltf/README.md | 8 ++++- npm/fbx2gltf/package.json | 3 +- npm/tests/test/fbx2gltf.ts | 5 ++- npm/tests/test/mocha.opts | 5 ++- src/FBX2glTF.cpp | 5 ++- src/FBX2glTF.h | 5 ++- src/fbx/Fbx2Raw.cpp | 5 ++- src/fbx/Fbx2Raw.hpp | 5 ++- src/fbx/FbxBlendShapesAccess.cpp | 5 ++- src/fbx/FbxBlendShapesAccess.hpp | 5 ++- src/fbx/FbxLayerElementAccess.hpp | 5 ++- src/fbx/FbxSkinningAccess.cpp | 9 ++--- src/fbx/FbxSkinningAccess.hpp | 5 ++- src/fbx/materials/3dsMaxPhysicalMaterial.cpp | 5 ++- src/fbx/materials/FbxMaterials.cpp | 5 ++- src/fbx/materials/FbxMaterials.hpp | 5 ++- .../materials/RoughnessMetallicMaterials.hpp | 5 ++- src/fbx/materials/StingrayPBSMaterial.cpp | 5 ++- src/fbx/materials/TraditionalMaterials.cpp | 5 ++- src/fbx/materials/TraditionalMaterials.hpp | 5 ++- src/gltf/GltfModel.cpp | 5 ++- src/gltf/GltfModel.hpp | 5 ++- src/gltf/Raw2Gltf.cpp | 5 ++- src/gltf/Raw2Gltf.hpp | 5 ++- src/gltf/TextureBuilder.cpp | 5 ++- src/gltf/TextureBuilder.hpp | 5 ++- src/gltf/properties/AccessorData.cpp | 5 ++- src/gltf/properties/AccessorData.hpp | 5 ++- src/gltf/properties/AnimationData.cpp | 5 ++- src/gltf/properties/AnimationData.hpp | 5 ++- src/gltf/properties/BufferData.cpp | 5 ++- src/gltf/properties/BufferData.hpp | 5 ++- src/gltf/properties/BufferViewData.cpp | 5 ++- src/gltf/properties/BufferViewData.hpp | 5 ++- src/gltf/properties/CameraData.cpp | 5 ++- src/gltf/properties/CameraData.hpp | 5 ++- src/gltf/properties/ImageData.cpp | 5 ++- src/gltf/properties/ImageData.hpp | 5 ++- src/gltf/properties/LightData.cpp | 5 ++- src/gltf/properties/LightData.hpp | 5 ++- src/gltf/properties/MaterialData.cpp | 5 ++- src/gltf/properties/MaterialData.hpp | 5 ++- src/gltf/properties/MeshData.cpp | 5 ++- src/gltf/properties/MeshData.hpp | 5 ++- src/gltf/properties/NodeData.cpp | 5 ++- src/gltf/properties/NodeData.hpp | 5 ++- src/gltf/properties/PrimitiveData.cpp | 5 ++- src/gltf/properties/PrimitiveData.hpp | 5 ++- src/gltf/properties/SamplerData.hpp | 5 ++- src/gltf/properties/SceneData.cpp | 5 ++- src/gltf/properties/SceneData.hpp | 5 ++- src/gltf/properties/SkinData.cpp | 5 ++- src/gltf/properties/SkinData.hpp | 5 ++- src/gltf/properties/TextureData.cpp | 5 ++- src/gltf/properties/TextureData.hpp | 5 ++- src/mathfu.hpp | 5 ++- src/raw/RawModel.cpp | 5 ++- src/raw/RawModel.hpp | 5 ++- src/utils/File_Utils.cpp | 5 ++- src/utils/File_Utils.hpp | 5 ++- src/utils/Image_Utils.cpp | 5 ++- src/utils/Image_Utils.hpp | 5 ++- src/utils/String_Utils.hpp | 5 ++- 70 files changed, 154 insertions(+), 276 deletions(-) delete mode 100644 PATENTS delete mode 100644 npm/fbx2gltf/PATENTS diff --git a/CMakeLists.txt b/CMakeLists.txt index 1092208..c5ffeb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,12 +17,6 @@ set(CMAKE_CXX_STANDARD 11) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") include(ExternalProject) -if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake") - message(FATAL_ERROR - "The Conan package manager must run ('install') first. ${typical_usage_str}") -endif() -include("${CMAKE_BINARY_DIR}/conan_paths.cmake") - # FBX foreach (FBXSDK_VERSION "2019.2") find_package(FBX) @@ -39,6 +33,12 @@ if (NOT FBXSDK_FOUND) ) endif() +if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake") + message(FATAL_ERROR + "The Conan package manager must run ('install') first. ${typical_usage_str}") +endif() +include("${CMAKE_BINARY_DIR}/conan_paths.cmake") + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) find_package(Iconv QUIET) diff --git a/FindFBX.cmake b/FindFBX.cmake index fdf904d..0c29dc1 100644 --- a/FindFBX.cmake +++ b/FindFBX.cmake @@ -24,28 +24,23 @@ else() endif() if (NOT DEFINED FBXSDK_VERSION) - set(FBXSDK_VERSION "2018.1.1") + set(FBXSDK_VERSION "2019.2") endif() set(_fbxsdk_vstudio_version "vs2017") message("Looking for FBX SDK version: ${FBXSDK_VERSION}") -if (DEFINED FBXSDK_SDKS) - get_filename_component(FBXSDK_SDKS_ABS ${FBXSDK_SDKS} ABSOLUTE) - - set(FBXSDK_APPLE_ROOT "${FBXSDK_SDKS_ABS}/Darwin/${FBXSDK_VERSION}") - set(FBXSDK_LINUX_ROOT "${FBXSDK_SDKS_ABS}/Linux/${FBXSDK_VERSION}") - set(FBXSDK_WINDOWS_ROOT "${FBXSDK_SDKS_ABS}/Windows/${FBXSDK_VERSION}") -else() - set(FBXSDK_APPLE_ROOT - "/Applications/Autodesk/FBX SDK/${FBXSDK_VERSION}") - set(FBXSDK_LINUX_ROOT - "/usr") - set(FBXSDK_WINDOWS_ROOT - "C:/Program Files/Autodesk/FBX/FBX SDK/${FBXSDK_VERSION}") +if (NOT DEFINED FBXSDK_SDKS) + set(FBXSDK_SDKS "${CMAKE_CURRENT_SOURCE_DIR}/sdk") endif() +get_filename_component(FBXSDK_SDKS_ABS ${FBXSDK_SDKS} ABSOLUTE) + +set(FBXSDK_APPLE_ROOT "${FBXSDK_SDKS_ABS}/Darwin/${FBXSDK_VERSION}") +set(FBXSDK_LINUX_ROOT "${FBXSDK_SDKS_ABS}/Linux/${FBXSDK_VERSION}") +set(FBXSDK_WINDOWS_ROOT "${FBXSDK_SDKS_ABS}/Windows/${FBXSDK_VERSION}") + if (APPLE) set(_fbxsdk_root "${FBXSDK_APPLE_ROOT}") set(_fbxsdk_libdir_debug "lib/clang/debug") diff --git a/LICENSE b/LICENSE index be6addb..2801536 100644 --- a/LICENSE +++ b/LICENSE @@ -2,7 +2,7 @@ BSD License For FBX2glTF software -Copyright (c) 2014-present, Facebook, Inc. All rights reserved. +Copyright (c) Facebook, Inc. and its affiliates. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/PATENTS b/PATENTS deleted file mode 100644 index 4168ccd..0000000 --- a/PATENTS +++ /dev/null @@ -1,33 +0,0 @@ -Additional Grant of Patent Rights Version 2 - -"Software" means the FBX2glTF software contributed by Facebook, Inc. - -Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software -("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable -(subject to the termination provision below) license under any Necessary -Claims, to make, have made, use, sell, offer to sell, import, and otherwise -transfer the Software. For avoidance of doubt, no license is granted under -Facebook’s rights in any patent claims that are infringed by (i) modifications -to the Software made by you or any third party or (ii) the Software in -combination with any software or other technology. - -The license granted hereunder will terminate, automatically and without notice, -if you (or any of your subsidiaries, corporate affiliates or agents) initiate -directly or indirectly, or take a direct financial interest in, any Patent -Assertion: (i) against Facebook or any of its subsidiaries or corporate -affiliates, (ii) against any party if such Patent Assertion arises in whole or -in part from any software, technology, product or service of Facebook or any of -its subsidiaries or corporate affiliates, or (iii) against any party relating -to the Software. Notwithstanding the foregoing, if Facebook or any of its -subsidiaries or corporate affiliates files a lawsuit alleging patent -infringement against you in the first instance, and you respond by filing a -patent infringement counterclaim in that lawsuit against that party that is -unrelated to the Software, the license granted hereunder will not terminate -under section (i) of this paragraph due to such counterclaim. - -A "Necessary Claim" is a claim of a patent owned by Facebook that is -necessarily infringed by the Software standing alone. - -A "Patent Assertion" is any lawsuit or other action alleging direct, indirect, -or contributory infringement or inducement to infringe any patent, including a -cross-claim or counterclaim. diff --git a/README.md b/README.md index f1f6fe5..ac719ea 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # FBX2glTF +[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) + + This is a command line tool for converting 3D model assets on Autodesk's venerable [FBX](https://www.autodesk.com/products/fbx/overview) format to [glTF 2.0](https://github.com/KhronosGroup/glTF/tree/master/specification/2.0), @@ -288,4 +291,4 @@ TODO items can be found - Amanda Watson ## License -FBX2glTF is BSD-licensed. We also provide an additional patent grant. +FBX2glTF is licensed under the [3-clause BSD license](LICENSE). diff --git a/npm/fbx2gltf/LICENSE b/npm/fbx2gltf/LICENSE index 832cda8..8d53340 100644 --- a/npm/fbx2gltf/LICENSE +++ b/npm/fbx2gltf/LICENSE @@ -2,7 +2,7 @@ BSD License For FBX2glTF software -Copyright (c) 2014-present, Facebook, Inc. All rights reserved. +Copyright (c) Facebook, Inc. and its affiliates. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/npm/fbx2gltf/PATENTS b/npm/fbx2gltf/PATENTS deleted file mode 100644 index 4168ccd..0000000 --- a/npm/fbx2gltf/PATENTS +++ /dev/null @@ -1,33 +0,0 @@ -Additional Grant of Patent Rights Version 2 - -"Software" means the FBX2glTF software contributed by Facebook, Inc. - -Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software -("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable -(subject to the termination provision below) license under any Necessary -Claims, to make, have made, use, sell, offer to sell, import, and otherwise -transfer the Software. For avoidance of doubt, no license is granted under -Facebook’s rights in any patent claims that are infringed by (i) modifications -to the Software made by you or any third party or (ii) the Software in -combination with any software or other technology. - -The license granted hereunder will terminate, automatically and without notice, -if you (or any of your subsidiaries, corporate affiliates or agents) initiate -directly or indirectly, or take a direct financial interest in, any Patent -Assertion: (i) against Facebook or any of its subsidiaries or corporate -affiliates, (ii) against any party if such Patent Assertion arises in whole or -in part from any software, technology, product or service of Facebook or any of -its subsidiaries or corporate affiliates, or (iii) against any party relating -to the Software. Notwithstanding the foregoing, if Facebook or any of its -subsidiaries or corporate affiliates files a lawsuit alleging patent -infringement against you in the first instance, and you respond by filing a -patent infringement counterclaim in that lawsuit against that party that is -unrelated to the Software, the license granted hereunder will not terminate -under section (i) of this paragraph due to such counterclaim. - -A "Necessary Claim" is a claim of a patent owned by Facebook that is -necessarily infringed by the Software standing alone. - -A "Patent Assertion" is any lawsuit or other action alleging direct, indirect, -or contributory infringement or inducement to infringe any patent, including a -cross-claim or counterclaim. diff --git a/npm/fbx2gltf/README.md b/npm/fbx2gltf/README.md index c774a8c..a558045 100644 --- a/npm/fbx2gltf/README.md +++ b/npm/fbx2gltf/README.md @@ -1,5 +1,8 @@ # FBX2glTF +[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) + + This is a command line tool for converting 3D model assets on the well-established [FBX](https://www.autodesk.com/products/fbx/overview) format to [glTF 2.0](https://github.com/KhronosGroup/glTF/tree/master/specification/2.0), @@ -53,6 +56,9 @@ The home of this tool is [here](https://github.com/facebookincubator/FBX2glTF). # Legal +FBX2glTF is licensed under the [3-clause BSD license](LICENSE). + +``` This software contains Autodesk® FBX® code developed by Autodesk, Inc. Copyright 2017 Autodesk, Inc. All rights, reserved. Such code is provided “as is” and Autodesk, Inc. disclaims any and all warranties, whether express or implied, @@ -64,4 +70,4 @@ 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 such code. - +``` diff --git a/npm/fbx2gltf/package.json b/npm/fbx2gltf/package.json index a9e35df..8ac0ea3 100644 --- a/npm/fbx2gltf/package.json +++ b/npm/fbx2gltf/package.json @@ -19,7 +19,6 @@ "homepage": "https://github.com/facebookincubator/FBX2glTF", "files": [ "LICENSE", - "PATENTS", "README.md", "bin", "index.js" @@ -27,4 +26,4 @@ "dependencies": { "rimraf": "^2.6.2" } -} +} \ No newline at end of file diff --git a/npm/tests/test/fbx2gltf.ts b/npm/tests/test/fbx2gltf.ts index 34ec3d3..92aea15 100644 --- a/npm/tests/test/fbx2gltf.ts +++ b/npm/tests/test/fbx2gltf.ts @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ import {assert, expect} from 'chai'; diff --git a/npm/tests/test/mocha.opts b/npm/tests/test/mocha.opts index 1745889..acb5279 100644 --- a/npm/tests/test/mocha.opts +++ b/npm/tests/test/mocha.opts @@ -1,9 +1,8 @@ -# Copyright (c) 2014-present, Facebook, Inc. +# Copyright (c) Facebook, Inc. and its affiliates. # All rights reserved. # # This source code is licensed under the BSD-style license found in the -# LICENSE file in the root directory of this source tree. An additional grant -# of patent rights can be found in the PATENTS file in the same directory. +# LICENSE file in the root directory of this source tree. --ui mocha-typescript --require source-map-support/register diff --git a/src/FBX2glTF.cpp b/src/FBX2glTF.cpp index 1b09eee..12c8dcc 100644 --- a/src/FBX2glTF.cpp +++ b/src/FBX2glTF.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include diff --git a/src/FBX2glTF.h b/src/FBX2glTF.h index 79be9f9..e075bbd 100644 --- a/src/FBX2glTF.h +++ b/src/FBX2glTF.h @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/fbx/Fbx2Raw.cpp b/src/fbx/Fbx2Raw.cpp index 8e68d21..e1a10fe 100644 --- a/src/fbx/Fbx2Raw.cpp +++ b/src/fbx/Fbx2Raw.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "Fbx2Raw.hpp" diff --git a/src/fbx/Fbx2Raw.hpp b/src/fbx/Fbx2Raw.hpp index f998001..c7a555c 100644 --- a/src/fbx/Fbx2Raw.hpp +++ b/src/fbx/Fbx2Raw.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/fbx/FbxBlendShapesAccess.cpp b/src/fbx/FbxBlendShapesAccess.cpp index 3530e23..7d9ee6f 100644 --- a/src/fbx/FbxBlendShapesAccess.cpp +++ b/src/fbx/FbxBlendShapesAccess.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "FbxBlendShapesAccess.hpp" diff --git a/src/fbx/FbxBlendShapesAccess.hpp b/src/fbx/FbxBlendShapesAccess.hpp index 85fd32d..5cb548c 100644 --- a/src/fbx/FbxBlendShapesAccess.hpp +++ b/src/fbx/FbxBlendShapesAccess.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/fbx/FbxLayerElementAccess.hpp b/src/fbx/FbxLayerElementAccess.hpp index e335ca1..195cb4b 100644 --- a/src/fbx/FbxLayerElementAccess.hpp +++ b/src/fbx/FbxLayerElementAccess.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once #include "FBX2glTF.h" diff --git a/src/fbx/FbxSkinningAccess.cpp b/src/fbx/FbxSkinningAccess.cpp index 795cece..0491a14 100644 --- a/src/fbx/FbxSkinningAccess.cpp +++ b/src/fbx/FbxSkinningAccess.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "FbxSkinningAccess.hpp" @@ -75,7 +74,9 @@ FbxSkinningAccess::FbxSkinningAccess(const FbxMesh* pMesh, FbxScene* pScene, Fbx } } for (int i = 0; i < controlPointCount; i++) { - const float weightSumRcp = 1.0 / (vertexJointWeights[i][0] + vertexJointWeights[i][1] + vertexJointWeights[i][2] + vertexJointWeights[i][3]); + const float weightSumRcp = 1.0 / + (vertexJointWeights[i][0] + vertexJointWeights[i][1] + vertexJointWeights[i][2] + + vertexJointWeights[i][3]); vertexJointWeights[i] *= weightSumRcp; } } diff --git a/src/fbx/FbxSkinningAccess.hpp b/src/fbx/FbxSkinningAccess.hpp index d36c04f..e43ef86 100644 --- a/src/fbx/FbxSkinningAccess.hpp +++ b/src/fbx/FbxSkinningAccess.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/fbx/materials/3dsMaxPhysicalMaterial.cpp b/src/fbx/materials/3dsMaxPhysicalMaterial.cpp index 362c3a7..1d17643 100644 --- a/src/fbx/materials/3dsMaxPhysicalMaterial.cpp +++ b/src/fbx/materials/3dsMaxPhysicalMaterial.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "RoughnessMetallicMaterials.hpp" diff --git a/src/fbx/materials/FbxMaterials.cpp b/src/fbx/materials/FbxMaterials.cpp index f7f5c07..7aeebcc 100644 --- a/src/fbx/materials/FbxMaterials.cpp +++ b/src/fbx/materials/FbxMaterials.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "fbx/Fbx2Raw.hpp" diff --git a/src/fbx/materials/FbxMaterials.hpp b/src/fbx/materials/FbxMaterials.hpp index c48a829..df9267a 100644 --- a/src/fbx/materials/FbxMaterials.hpp +++ b/src/fbx/materials/FbxMaterials.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/fbx/materials/RoughnessMetallicMaterials.hpp b/src/fbx/materials/RoughnessMetallicMaterials.hpp index ad430ae..110a19f 100644 --- a/src/fbx/materials/RoughnessMetallicMaterials.hpp +++ b/src/fbx/materials/RoughnessMetallicMaterials.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/fbx/materials/StingrayPBSMaterial.cpp b/src/fbx/materials/StingrayPBSMaterial.cpp index a17fb8f..f565fd1 100644 --- a/src/fbx/materials/StingrayPBSMaterial.cpp +++ b/src/fbx/materials/StingrayPBSMaterial.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "RoughnessMetallicMaterials.hpp" diff --git a/src/fbx/materials/TraditionalMaterials.cpp b/src/fbx/materials/TraditionalMaterials.cpp index 919dd99..d2a21b2 100644 --- a/src/fbx/materials/TraditionalMaterials.cpp +++ b/src/fbx/materials/TraditionalMaterials.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "TraditionalMaterials.hpp" diff --git a/src/fbx/materials/TraditionalMaterials.hpp b/src/fbx/materials/TraditionalMaterials.hpp index 31a3912..41fae7d 100644 --- a/src/fbx/materials/TraditionalMaterials.hpp +++ b/src/fbx/materials/TraditionalMaterials.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "FbxMaterials.hpp" diff --git a/src/gltf/GltfModel.cpp b/src/gltf/GltfModel.cpp index 7bf53ba..d4e981f 100644 --- a/src/gltf/GltfModel.cpp +++ b/src/gltf/GltfModel.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "GltfModel.hpp" diff --git a/src/gltf/GltfModel.hpp b/src/gltf/GltfModel.hpp index 7c7d52c..9a15437 100644 --- a/src/gltf/GltfModel.hpp +++ b/src/gltf/GltfModel.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/Raw2Gltf.cpp b/src/gltf/Raw2Gltf.cpp index 9f627ba..0e2c592 100644 --- a/src/gltf/Raw2Gltf.cpp +++ b/src/gltf/Raw2Gltf.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "Raw2Gltf.hpp" diff --git a/src/gltf/Raw2Gltf.hpp b/src/gltf/Raw2Gltf.hpp index cd44b41..f30b545 100644 --- a/src/gltf/Raw2Gltf.hpp +++ b/src/gltf/Raw2Gltf.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/TextureBuilder.cpp b/src/gltf/TextureBuilder.cpp index c09393c..7424a5a 100644 --- a/src/gltf/TextureBuilder.cpp +++ b/src/gltf/TextureBuilder.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "TextureBuilder.hpp" diff --git a/src/gltf/TextureBuilder.hpp b/src/gltf/TextureBuilder.hpp index c60368d..8d1bb44 100644 --- a/src/gltf/TextureBuilder.hpp +++ b/src/gltf/TextureBuilder.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/AccessorData.cpp b/src/gltf/properties/AccessorData.cpp index 564260d..3626c4e 100644 --- a/src/gltf/properties/AccessorData.cpp +++ b/src/gltf/properties/AccessorData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "AccessorData.hpp" diff --git a/src/gltf/properties/AccessorData.hpp b/src/gltf/properties/AccessorData.hpp index 06c93e6..5a72e70 100644 --- a/src/gltf/properties/AccessorData.hpp +++ b/src/gltf/properties/AccessorData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/AnimationData.cpp b/src/gltf/properties/AnimationData.cpp index a2fcced..9b26d43 100644 --- a/src/gltf/properties/AnimationData.cpp +++ b/src/gltf/properties/AnimationData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "AnimationData.hpp" diff --git a/src/gltf/properties/AnimationData.hpp b/src/gltf/properties/AnimationData.hpp index 5703f25..31a1be6 100644 --- a/src/gltf/properties/AnimationData.hpp +++ b/src/gltf/properties/AnimationData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/BufferData.cpp b/src/gltf/properties/BufferData.cpp index 4fc8171..b4394e9 100644 --- a/src/gltf/properties/BufferData.cpp +++ b/src/gltf/properties/BufferData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include diff --git a/src/gltf/properties/BufferData.hpp b/src/gltf/properties/BufferData.hpp index 58d1474..4ba38e9 100644 --- a/src/gltf/properties/BufferData.hpp +++ b/src/gltf/properties/BufferData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/BufferViewData.cpp b/src/gltf/properties/BufferViewData.cpp index 34f23ce..8e45480 100644 --- a/src/gltf/properties/BufferViewData.cpp +++ b/src/gltf/properties/BufferViewData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "BufferViewData.hpp" diff --git a/src/gltf/properties/BufferViewData.hpp b/src/gltf/properties/BufferViewData.hpp index a65c6bf..8e85cc5 100644 --- a/src/gltf/properties/BufferViewData.hpp +++ b/src/gltf/properties/BufferViewData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/CameraData.cpp b/src/gltf/properties/CameraData.cpp index 78dcdc7..3426a0f 100644 --- a/src/gltf/properties/CameraData.cpp +++ b/src/gltf/properties/CameraData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "CameraData.hpp" diff --git a/src/gltf/properties/CameraData.hpp b/src/gltf/properties/CameraData.hpp index 78fe500..cd2f241 100644 --- a/src/gltf/properties/CameraData.hpp +++ b/src/gltf/properties/CameraData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/ImageData.cpp b/src/gltf/properties/ImageData.cpp index b816c7e..202486f 100644 --- a/src/gltf/properties/ImageData.cpp +++ b/src/gltf/properties/ImageData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "ImageData.hpp" diff --git a/src/gltf/properties/ImageData.hpp b/src/gltf/properties/ImageData.hpp index ece5aef..fdef782 100644 --- a/src/gltf/properties/ImageData.hpp +++ b/src/gltf/properties/ImageData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/LightData.cpp b/src/gltf/properties/LightData.cpp index 34bdd40..39b6f3a 100644 --- a/src/gltf/properties/LightData.cpp +++ b/src/gltf/properties/LightData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "LightData.hpp" diff --git a/src/gltf/properties/LightData.hpp b/src/gltf/properties/LightData.hpp index 8445cd5..49d68ea 100644 --- a/src/gltf/properties/LightData.hpp +++ b/src/gltf/properties/LightData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/MaterialData.cpp b/src/gltf/properties/MaterialData.cpp index c1697b3..dd5621e 100644 --- a/src/gltf/properties/MaterialData.cpp +++ b/src/gltf/properties/MaterialData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "MaterialData.hpp" diff --git a/src/gltf/properties/MaterialData.hpp b/src/gltf/properties/MaterialData.hpp index 4a203df..d7a2ae5 100644 --- a/src/gltf/properties/MaterialData.hpp +++ b/src/gltf/properties/MaterialData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/MeshData.cpp b/src/gltf/properties/MeshData.cpp index c9e952a..0ec3cdd 100644 --- a/src/gltf/properties/MeshData.cpp +++ b/src/gltf/properties/MeshData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "MeshData.hpp" diff --git a/src/gltf/properties/MeshData.hpp b/src/gltf/properties/MeshData.hpp index 786ea9a..a8eda7c 100644 --- a/src/gltf/properties/MeshData.hpp +++ b/src/gltf/properties/MeshData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/NodeData.cpp b/src/gltf/properties/NodeData.cpp index 2093421..3d7050b 100644 --- a/src/gltf/properties/NodeData.cpp +++ b/src/gltf/properties/NodeData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "NodeData.hpp" diff --git a/src/gltf/properties/NodeData.hpp b/src/gltf/properties/NodeData.hpp index 6ee8315..5b1b483 100644 --- a/src/gltf/properties/NodeData.hpp +++ b/src/gltf/properties/NodeData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/PrimitiveData.cpp b/src/gltf/properties/PrimitiveData.cpp index fe6e7c0..9ee0bcc 100644 --- a/src/gltf/properties/PrimitiveData.cpp +++ b/src/gltf/properties/PrimitiveData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "PrimitiveData.hpp" diff --git a/src/gltf/properties/PrimitiveData.hpp b/src/gltf/properties/PrimitiveData.hpp index 3153229..6e87e53 100644 --- a/src/gltf/properties/PrimitiveData.hpp +++ b/src/gltf/properties/PrimitiveData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/SamplerData.hpp b/src/gltf/properties/SamplerData.hpp index 4361bba..5287ba1 100644 --- a/src/gltf/properties/SamplerData.hpp +++ b/src/gltf/properties/SamplerData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/SceneData.cpp b/src/gltf/properties/SceneData.cpp index dd68497..cf57f0b 100644 --- a/src/gltf/properties/SceneData.cpp +++ b/src/gltf/properties/SceneData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "SceneData.hpp" diff --git a/src/gltf/properties/SceneData.hpp b/src/gltf/properties/SceneData.hpp index cfef6ab..4a008fb 100644 --- a/src/gltf/properties/SceneData.hpp +++ b/src/gltf/properties/SceneData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/SkinData.cpp b/src/gltf/properties/SkinData.cpp index 1c808bf..6b6fe33 100644 --- a/src/gltf/properties/SkinData.cpp +++ b/src/gltf/properties/SkinData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "SkinData.hpp" diff --git a/src/gltf/properties/SkinData.hpp b/src/gltf/properties/SkinData.hpp index 1028ebd..0a43306 100644 --- a/src/gltf/properties/SkinData.hpp +++ b/src/gltf/properties/SkinData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/gltf/properties/TextureData.cpp b/src/gltf/properties/TextureData.cpp index 79080a9..ee9208c 100644 --- a/src/gltf/properties/TextureData.cpp +++ b/src/gltf/properties/TextureData.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "TextureData.hpp" diff --git a/src/gltf/properties/TextureData.hpp b/src/gltf/properties/TextureData.hpp index 8c69f40..e886390 100644 --- a/src/gltf/properties/TextureData.hpp +++ b/src/gltf/properties/TextureData.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/mathfu.hpp b/src/mathfu.hpp index 2dd8301..6d54dfc 100644 --- a/src/mathfu.hpp +++ b/src/mathfu.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/raw/RawModel.cpp b/src/raw/RawModel.cpp index cafc076..f5c40d9 100644 --- a/src/raw/RawModel.cpp +++ b/src/raw/RawModel.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "RawModel.hpp" diff --git a/src/raw/RawModel.hpp b/src/raw/RawModel.hpp index c21c4bb..1da65bb 100644 --- a/src/raw/RawModel.hpp +++ b/src/raw/RawModel.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/utils/File_Utils.cpp b/src/utils/File_Utils.cpp index 4f9885d..1de773a 100644 --- a/src/utils/File_Utils.cpp +++ b/src/utils/File_Utils.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "File_Utils.hpp" diff --git a/src/utils/File_Utils.hpp b/src/utils/File_Utils.hpp index 92827de..7bd228d 100644 --- a/src/utils/File_Utils.hpp +++ b/src/utils/File_Utils.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/utils/Image_Utils.cpp b/src/utils/Image_Utils.cpp index 23c107e..cbe8b33 100644 --- a/src/utils/Image_Utils.cpp +++ b/src/utils/Image_Utils.cpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #include "Image_Utils.hpp" diff --git a/src/utils/Image_Utils.hpp b/src/utils/Image_Utils.hpp index a391163..153919c 100644 --- a/src/utils/Image_Utils.hpp +++ b/src/utils/Image_Utils.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once diff --git a/src/utils/String_Utils.hpp b/src/utils/String_Utils.hpp index 2f261ef..7060da2 100644 --- a/src/utils/String_Utils.hpp +++ b/src/utils/String_Utils.hpp @@ -1,10 +1,9 @@ /** - * Copyright (c) 2014-present, Facebook, Inc. + * Copyright (c) Facebook, Inc. and its affiliates. * All rights reserved. * * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * LICENSE file in the root directory of this source tree. */ #pragma once