From f56bb2cf50c62d12c02d272162b3e00e04d2b067 Mon Sep 17 00:00:00 2001 From: manuelk Date: Thu, 18 Jul 2013 15:05:24 -0700 Subject: [PATCH] Updating EULA --- documentation/api_overview.rst | 76 ++++++--------------- documentation/cmake_build.rst | 76 ++++++--------------- documentation/code_examples.rst | 76 ++++++--------------- documentation/css/default.css | 76 ++++++--------------- documentation/css/doxy.css | 76 ++++++--------------- documentation/css/flavor.css | 76 ++++++--------------- documentation/css/renderman-university.css | 76 ++++++--------------- documentation/css/rst.css | 76 ++++++--------------- documentation/dxviewer.rst | 76 ++++++--------------- documentation/getting_started.rst | 76 ++++++--------------- documentation/glbatchviewer.rst | 76 ++++++--------------- documentation/glviewer.rst | 76 ++++++--------------- documentation/intro.rst | 76 ++++++--------------- documentation/limiteval.rst | 76 ++++++--------------- documentation/painttest.rst | 76 ++++++--------------- documentation/processHtml.py | 1 + documentation/ptexviewer.rst | 76 ++++++--------------- documentation/release_notes.rst | 76 ++++++--------------- documentation/search.html | 76 ++++++--------------- documentation/subdivision_surfaces.rst | 76 ++++++--------------- documentation/using_osd.rst | 76 ++++++--------------- documentation/using_osd_compile.rst | 76 ++++++--------------- documentation/using_osd_hbr.rst | 76 ++++++--------------- documentation/using_osd_textures.rst | 78 +++++++--------------- 24 files changed, 508 insertions(+), 1243 deletions(-) diff --git a/documentation/api_overview.rst b/documentation/api_overview.rst index b30979b0..d725095e 100644 --- a/documentation/api_overview.rst +++ b/documentation/api_overview.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. API Overview diff --git a/documentation/cmake_build.rst b/documentation/cmake_build.rst index 609ddaa3..5d567b46 100644 --- a/documentation/cmake_build.rst +++ b/documentation/cmake_build.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Building with Cmake diff --git a/documentation/code_examples.rst b/documentation/code_examples.rst index 5d1944e2..1ac70500 100644 --- a/documentation/code_examples.rst +++ b/documentation/code_examples.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Code Examples diff --git a/documentation/css/default.css b/documentation/css/default.css index 33b1b1b9..2dc8bec9 100644 --- a/documentation/css/default.css +++ b/documentation/css/default.css @@ -1,58 +1,26 @@ /* - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. */ /*-------------------------------GENERAL STYLES-------------------------------*/ diff --git a/documentation/css/doxy.css b/documentation/css/doxy.css index 376179a1..4726d369 100644 --- a/documentation/css/doxy.css +++ b/documentation/css/doxy.css @@ -1,58 +1,26 @@ /* - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. */ #top { diff --git a/documentation/css/flavor.css b/documentation/css/flavor.css index 2e4cb627..9870136f 100644 --- a/documentation/css/flavor.css +++ b/documentation/css/flavor.css @@ -1,58 +1,26 @@ /* - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. */ /* Basic Styles diff --git a/documentation/css/renderman-university.css b/documentation/css/renderman-university.css index 039610b5..25ce8cf4 100644 --- a/documentation/css/renderman-university.css +++ b/documentation/css/renderman-university.css @@ -1,58 +1,26 @@ /* - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. */ .coursewareBackground { background: #efefef; diff --git a/documentation/css/rst.css b/documentation/css/rst.css index b15bcb94..0f0abf21 100644 --- a/documentation/css/rst.css +++ b/documentation/css/rst.css @@ -1,58 +1,26 @@ /* - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. */ diff --git a/documentation/dxviewer.rst b/documentation/dxviewer.rst index 9508bf38..94f80fa6 100644 --- a/documentation/dxviewer.rst +++ b/documentation/dxviewer.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. dxViewer diff --git a/documentation/getting_started.rst b/documentation/getting_started.rst index 559a5470..32e63994 100644 --- a/documentation/getting_started.rst +++ b/documentation/getting_started.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Getting Started diff --git a/documentation/glbatchviewer.rst b/documentation/glbatchviewer.rst index ca2fb253..f9c469d0 100644 --- a/documentation/glbatchviewer.rst +++ b/documentation/glbatchviewer.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. glBatchViewer diff --git a/documentation/glviewer.rst b/documentation/glviewer.rst index 91bedc3f..6bb3f786 100644 --- a/documentation/glviewer.rst +++ b/documentation/glviewer.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. glViewer diff --git a/documentation/intro.rst b/documentation/intro.rst index 34c2fe5f..71a6f9e6 100644 --- a/documentation/intro.rst +++ b/documentation/intro.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Introduction diff --git a/documentation/limiteval.rst b/documentation/limiteval.rst index 0e173b3f..0335392d 100644 --- a/documentation/limiteval.rst +++ b/documentation/limiteval.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. limitEval diff --git a/documentation/painttest.rst b/documentation/painttest.rst index 5cfafba2..d75a77a4 100644 --- a/documentation/painttest.rst +++ b/documentation/painttest.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. paintTest diff --git a/documentation/processHtml.py b/documentation/processHtml.py index f45f4e26..76011984 100755 --- a/documentation/processHtml.py +++ b/documentation/processHtml.py @@ -23,6 +23,7 @@ # language governing permissions and limitations under the # License. # + import os import sys import string diff --git a/documentation/ptexviewer.rst b/documentation/ptexviewer.rst index 83a6a45e..3f09135c 100644 --- a/documentation/ptexviewer.rst +++ b/documentation/ptexviewer.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. ptexViewer diff --git a/documentation/release_notes.rst b/documentation/release_notes.rst index bb97cd95..1e607427 100644 --- a/documentation/release_notes.rst +++ b/documentation/release_notes.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Release Notes diff --git a/documentation/search.html b/documentation/search.html index b7e54b45..e1dfb9bb 100644 --- a/documentation/search.html +++ b/documentation/search.html @@ -1,59 +1,27 @@ diff --git a/documentation/subdivision_surfaces.rst b/documentation/subdivision_surfaces.rst index 2a78bed5..d1337c32 100644 --- a/documentation/subdivision_surfaces.rst +++ b/documentation/subdivision_surfaces.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Subdivision Surfaces diff --git a/documentation/using_osd.rst b/documentation/using_osd.rst index aed75bd0..c4112c98 100644 --- a/documentation/using_osd.rst +++ b/documentation/using_osd.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Using OpenSubdiv diff --git a/documentation/using_osd_compile.rst b/documentation/using_osd_compile.rst index 661d930a..ad4a2a73 100644 --- a/documentation/using_osd_compile.rst +++ b/documentation/using_osd_compile.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Using OpenSubdiv diff --git a/documentation/using_osd_hbr.rst b/documentation/using_osd_hbr.rst index 8dc663ca..5d297997 100644 --- a/documentation/using_osd_hbr.rst +++ b/documentation/using_osd_hbr.rst @@ -1,58 +1,26 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. Using Hbr diff --git a/documentation/using_osd_textures.rst b/documentation/using_osd_textures.rst index d7623bf7..73748145 100644 --- a/documentation/using_osd_textures.rst +++ b/documentation/using_osd_textures.rst @@ -1,59 +1,27 @@ .. - Copyright (C) Pixar. All rights reserved. - - This license governs use of the accompanying software. If you - use the software, you accept this license. If you do not accept - the license, do not use the software. - - 1. Definitions - The terms "reproduce," "reproduction," "derivative works," and - "distribution" have the same meaning here as under U.S. - copyright law. A "contribution" is the original software, or - any additions or changes to the software. - A "contributor" is any person or entity that distributes its - contribution under this license. - "Licensed patents" are a contributor's patent claims that read - directly on its contribution. - - 2. Grant of Rights - (A) Copyright Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free copyright license to reproduce its contribution, - prepare derivative works of its contribution, and distribute - its contribution or any derivative works that you create. - (B) Patent Grant- Subject to the terms of this license, - including the license conditions and limitations in section 3, - each contributor grants you a non-exclusive, worldwide, - royalty-free license under its licensed patents to make, have - made, use, sell, offer for sale, import, and/or otherwise - dispose of its contribution in the software or derivative works - of the contribution in the software. - - 3. Conditions and Limitations - (A) No Trademark License- This license does not grant you - rights to use any contributor's name, logo, or trademarks. - (B) If you bring a patent claim against any contributor over - patents that you claim are infringed by the software, your - patent license from such contributor to the software ends - automatically. - (C) If you distribute any portion of the software, you must - retain all copyright, patent, trademark, and attribution - notices that are present in the software. - (D) If you distribute any portion of the software in source - code form, you may do so only under this license by including a - complete copy of this license with your distribution. If you - distribute any portion of the software in compiled or object - code form, you may only do so under a license that complies - with this license. - (E) The software is licensed "as-is." You bear the risk of - using it. The contributors give no express warranties, - guarantees or conditions. You may have additional consumer - rights under your local laws which this license cannot change. - To the extent permitted under your local laws, the contributors - exclude the implied warranties of merchantability, fitness for - a particular purpose and non-infringement. - + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License + and the following modification to it: Section 6 Trademarks. + deleted and replaced with: + + 6. Trademarks. This License does not grant permission to use the + trade names, trademarks, service marks, or product names of the + Licensor and its affiliates, except as required for reproducing + the content of the NOTICE file. + + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. + Using Textures --------------