From 3ae50d1c50c59c75a7435f571852b44b6d2112eb Mon Sep 17 00:00:00 2001 From: manuelk Date: Thu, 26 Sep 2013 12:04:57 -0700 Subject: [PATCH] Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is 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 to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License. --- CMakeLists.txt | 33 ++++++------ LICENSE.txt | 50 +------------------ cmake/FindDXSDK.cmake | 33 ++++++------ cmake/FindDocutils.cmake | 33 ++++++------ cmake/FindGLEW.cmake | 33 ++++++------ cmake/FindGLFW.cmake | 33 ++++++------ cmake/FindIlmBase.cmake | 33 ++++++------ cmake/FindMaya.cmake | 33 ++++++------ cmake/FindOpenCL.cmake | 33 ++++++------ cmake/FindOpenGLES.cmake | 33 ++++++------ cmake/FindPTex.cmake | 33 ++++++------ cmake/FindTBB.cmake | 33 ++++++------ documentation/CMakeLists.txt | 33 ++++++------ documentation/OpenSubdiv.doxy | 23 +++++++++ documentation/README | 43 ++++++++-------- documentation/additional_resources.rst | 43 ++++++++-------- documentation/api_overview.rst | 43 ++++++++-------- documentation/cmake_build.rst | 43 ++++++++-------- documentation/code_examples.rst | 43 ++++++++-------- documentation/css/default.css | 43 ++++++++-------- documentation/css/doxy.css | 43 ++++++++-------- documentation/css/flavor.css | 43 ++++++++-------- documentation/css/renderman-university.css | 43 ++++++++-------- documentation/css/rst.css | 43 ++++++++-------- documentation/dxviewer.rst | 43 ++++++++-------- documentation/far_overview.rst | 43 ++++++++-------- documentation/getting_started.rst | 43 ++++++++-------- documentation/glbatchviewer.rst | 43 ++++++++-------- documentation/glstencilviewer.rst | 43 ++++++++-------- documentation/glviewer.rst | 43 ++++++++-------- documentation/hbr_overview.rst | 43 ++++++++-------- documentation/intro.rst | 43 ++++++++-------- documentation/limiteval.rst | 43 ++++++++-------- documentation/nav_template.txt | 43 ++++++++-------- documentation/osd_overview.rst | 43 ++++++++-------- documentation/painttest.rst | 43 ++++++++-------- documentation/processHtml.py | 33 ++++++------ documentation/ptexviewer.rst | 43 ++++++++-------- documentation/release_notes.rst | 43 ++++++++-------- documentation/search.html | 43 ++++++++-------- documentation/subdivision_surfaces.rst | 43 ++++++++-------- documentation/using_osd.rst | 43 ++++++++-------- documentation/using_osd_compile.rst | 43 ++++++++-------- documentation/using_osd_hbr.rst | 43 ++++++++-------- documentation/using_osd_textures.rst | 43 ++++++++-------- examples/CMakeLists.txt | 33 ++++++------ examples/common/clInit.h | 34 ++++++------- examples/common/cudaInit.h | 34 ++++++------- examples/common/d3d11_compile.h | 34 ++++++------- examples/common/d3d11_hud.cpp | 34 ++++++------- examples/common/d3d11_hud.h | 34 ++++++------- examples/common/export_obj.py | 34 ++++++------- examples/common/font_image.cpp | 33 ++++++------ examples/common/font_image.h | 33 ++++++------ examples/common/gl_hud.cpp | 33 ++++++------ examples/common/gl_hud.h | 34 ++++++------- examples/common/hdr_reader.cpp | 34 ++++++------- examples/common/hdr_reader.h | 33 ++++++------ examples/common/hud.cpp | 34 ++++++------- examples/common/hud.h | 34 ++++++------- examples/common/maya_util.h | 34 ++++++------- examples/common/patchColors.cpp | 33 ++++++------ examples/common/patchColors.h | 34 ++++++------- examples/common/simple_math.h | 34 ++++++------- examples/common/stopwatch.h | 33 ++++++------ examples/dxViewer/CMakeLists.txt | 33 ++++++------ examples/dxViewer/dxviewer.cpp | 34 ++++++------- examples/dxViewer/shader.hlsl | 33 ++++++------ examples/glBatchViewer/CMakeLists.txt | 33 ++++++------ examples/glBatchViewer/delegate.cpp | 33 ++++++------ examples/glBatchViewer/delegate.h | 34 ++++++------- examples/glBatchViewer/effect.cpp | 33 ++++++------ examples/glBatchViewer/effect.h | 34 ++++++------- examples/glBatchViewer/effectRegistry.cpp | 33 ++++++------ examples/glBatchViewer/effectRegistry.h | 34 ++++++------- examples/glBatchViewer/shader.glsl | 33 ++++++------ examples/glBatchViewer/shader_gl3.glsl | 33 ++++++------ examples/glBatchViewer/shapes.h | 33 ++++++------ examples/glBatchViewer/viewer.cpp | 33 ++++++------ examples/glStencilViewer/CMakeLists.txt | 33 ++++++------ examples/glStencilViewer/main.cpp | 33 ++++++------ examples/glViewer/CMakeLists.txt | 33 ++++++------ examples/glViewer/shader.glsl | 33 ++++++------ examples/glViewer/shader_gl3.glsl | 33 ++++++------ examples/glViewer/viewer.cpp | 33 ++++++------ examples/limitEval/CMakeLists.txt | 33 ++++++------ examples/limitEval/main.cpp | 33 ++++++------ .../AEopenSubdivPtexShaderTemplate.mel | 23 +++++++++ examples/mayaPtexViewer/CMakeLists.txt | 33 ++++++------ .../mayaPtexViewer/OpenSubdivPtexShader.cpp | 33 ++++++------ .../mayaPtexViewer/OpenSubdivPtexShader.h | 34 ++++++------- .../OpenSubdivPtexShaderOverride.cpp | 33 ++++++------ .../OpenSubdivPtexShaderOverride.h | 33 ++++++------ examples/mayaPtexViewer/cudaUtil.cpp | 33 ++++++------ examples/mayaPtexViewer/hbrUtil.cpp | 33 ++++++------ examples/mayaPtexViewer/hbrUtil.h | 34 ++++++------- examples/mayaPtexViewer/osdPtexMeshData.cpp | 33 ++++++------ examples/mayaPtexViewer/osdPtexMeshData.h | 34 ++++++------- examples/mayaPtexViewer/shader.glsl | 33 ++++++------ .../mayaViewer/AEopenSubdivShaderTemplate.mel | 23 +++++++++ examples/mayaViewer/CMakeLists.txt | 33 ++++++------ examples/mayaViewer/OpenSubdivShader.cpp | 33 ++++++------ examples/mayaViewer/OpenSubdivShader.h | 33 ++++++------ .../mayaViewer/OpenSubdivShaderOverride.cpp | 33 ++++++------ .../mayaViewer/OpenSubdivShaderOverride.h | 33 ++++++------ examples/mayaViewer/cudaUtil.cpp | 33 ++++++------ examples/mayaViewer/hbrUtil.cpp | 33 ++++++------ examples/mayaViewer/hbrUtil.h | 34 ++++++------- examples/mayaViewer/mayaViewer.cpp | 33 ++++++------ examples/mayaViewer/osdMeshData.cpp | 33 ++++++------ examples/mayaViewer/osdMeshData.h | 34 ++++++------- examples/mayaViewer/shader.glsl | 33 ++++++------ examples/paintTest/CMakeLists.txt | 33 ++++++------ examples/paintTest/main.cpp | 33 ++++++------ examples/paintTest/paintShader.glsl | 33 ++++++------ examples/paintTest/shader.glsl | 33 ++++++------ examples/ptexViewer/CMakeLists.txt | 33 ++++++------ examples/ptexViewer/imageshader.glsl | 33 ++++++------ examples/ptexViewer/shader.glsl | 33 ++++++------ examples/ptexViewer/shader_gl3.glsl | 33 ++++++------ examples/ptexViewer/skyshader.glsl | 33 ++++++------ examples/ptexViewer/viewer.cpp | 34 ++++++------- examples/python/__init__.py | 33 ++++++------ examples/python/canvas.py | 33 ++++++------ examples/python/interactive.py | 33 ++++++------ examples/python/main.py | 34 ++++++------- examples/python/renderer.py | 33 ++++++------ examples/python/shaders.py | 33 ++++++------ examples/python/simple.glsl | 33 ++++++------ examples/python/utility.py | 33 ++++++------ examples/python/window.py | 33 ++++++------ examples/simpleCpu/CMakeLists.txt | 33 ++++++------ examples/simpleCpu/algebra.h | 34 ++++++------- examples/simpleCpu/glhelpers.h | 34 ++++++------- examples/simpleCpu/main.cpp | 34 ++++++------- examples/simpleCpu/shader.glsl | 33 ++++++------ examples/simpleCpu/simpleCpuSubdivision.cpp | 33 ++++++------ .../simpleCpu/simpleCpuSubdivision_org.cpp | 33 ++++++------ examples/uvViewer/CMakeLists.txt | 33 ++++++------ examples/uvViewer/shader.glsl | 33 ++++++------ examples/uvViewer/viewer.cpp | 33 ++++++------ opensubdiv/CMakeLists.txt | 33 ++++++------ opensubdiv/far/CMakeLists.txt | 33 ++++++------ opensubdiv/far/bilinearSubdivisionTables.h | 33 ++++++------ .../far/bilinearSubdivisionTablesFactory.h | 33 ++++++------ opensubdiv/far/catmarkSubdivisionTables.h | 33 ++++++------ .../far/catmarkSubdivisionTablesFactory.h | 33 ++++++------ opensubdiv/far/dispatcher.h | 34 ++++++------- opensubdiv/far/kernelBatch.h | 34 ++++++------- opensubdiv/far/kernelBatchFactory.h | 34 ++++++------- opensubdiv/far/loopSubdivisionTables.h | 33 ++++++------ opensubdiv/far/loopSubdivisionTablesFactory.h | 33 ++++++------ opensubdiv/far/mesh.h | 33 ++++++------ opensubdiv/far/meshFactory.h | 33 ++++++------ opensubdiv/far/multiMeshFactory.h | 33 ++++++------ opensubdiv/far/patchMap.h | 33 ++++++------ opensubdiv/far/patchParam.h | 33 ++++++------ opensubdiv/far/patchTables.h | 33 ++++++------ opensubdiv/far/patchTablesFactory.h | 33 ++++++------ opensubdiv/far/stencilTables.h | 33 ++++++------ opensubdiv/far/stencilTablesFactory.h | 33 ++++++------ opensubdiv/far/subdivisionTables.h | 33 ++++++------ opensubdiv/far/subdivisionTablesFactory.h | 33 ++++++------ opensubdiv/far/vertexEditTables.h | 33 ++++++------ opensubdiv/far/vertexEditTablesFactory.h | 33 ++++++------ opensubdiv/hbr/CMakeLists.txt | 33 ++++++------ opensubdiv/hbr/allocator.h | 34 ++++++------- opensubdiv/hbr/bilinear.h | 34 ++++++------- opensubdiv/hbr/catmark.h | 34 ++++++------- opensubdiv/hbr/cornerEdit.h | 34 ++++++------- opensubdiv/hbr/creaseEdit.h | 34 ++++++------- opensubdiv/hbr/face.h | 34 ++++++------- opensubdiv/hbr/faceEdit.h | 34 ++++++------- opensubdiv/hbr/fvarData.h | 34 ++++++------- opensubdiv/hbr/fvarEdit.h | 34 ++++++------- opensubdiv/hbr/halfedge.h | 34 ++++++------- opensubdiv/hbr/hierarchicalEdit.h | 34 ++++++------- opensubdiv/hbr/holeEdit.h | 34 ++++++------- opensubdiv/hbr/loop.h | 34 ++++++------- opensubdiv/hbr/mesh.h | 34 ++++++------- opensubdiv/hbr/subdivision.h | 34 ++++++------- opensubdiv/hbr/vertex.h | 34 ++++++------- opensubdiv/hbr/vertexEdit.h | 34 ++++++------- opensubdiv/osd/Android.mk | 33 ++++++------ opensubdiv/osd/CMakeLists.txt | 33 ++++++------ opensubdiv/osd/clComputeContext.cpp | 33 ++++++------ opensubdiv/osd/clComputeContext.h | 34 ++++++------- opensubdiv/osd/clComputeController.cpp | 33 ++++++------ opensubdiv/osd/clComputeController.h | 34 ++++++------- opensubdiv/osd/clD3D11VertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/clD3D11VertexBuffer.h | 34 ++++++------- opensubdiv/osd/clGLVertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/clGLVertexBuffer.h | 34 ++++++------- opensubdiv/osd/clKernel.cl | 33 ++++++------ opensubdiv/osd/clKernelBundle.cpp | 33 ++++++------ opensubdiv/osd/clKernelBundle.h | 34 ++++++------- opensubdiv/osd/clVertexBuffer.cpp | 34 ++++++------- opensubdiv/osd/clVertexBuffer.h | 34 ++++++------- opensubdiv/osd/computeController.h | 34 ++++++------- opensubdiv/osd/cpuComputeContext.cpp | 33 ++++++------ opensubdiv/osd/cpuComputeContext.h | 34 ++++++------- opensubdiv/osd/cpuComputeController.cpp | 33 ++++++------ opensubdiv/osd/cpuComputeController.h | 34 ++++++------- opensubdiv/osd/cpuD3D11VertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/cpuD3D11VertexBuffer.h | 34 ++++++------- opensubdiv/osd/cpuEvalLimitContext.cpp | 33 ++++++------ opensubdiv/osd/cpuEvalLimitContext.h | 34 ++++++------- opensubdiv/osd/cpuEvalLimitController.cpp | 33 ++++++------ opensubdiv/osd/cpuEvalLimitController.h | 34 ++++++------- opensubdiv/osd/cpuEvalLimitKernel.cpp | 33 ++++++------ opensubdiv/osd/cpuEvalLimitKernel.h | 34 ++++++------- opensubdiv/osd/cpuEvalStencilsContext.cpp | 33 ++++++------ opensubdiv/osd/cpuEvalStencilsContext.h | 33 ++++++------ opensubdiv/osd/cpuEvalStencilsController.cpp | 33 ++++++------ opensubdiv/osd/cpuEvalStencilsController.h | 33 ++++++------ opensubdiv/osd/cpuGLVertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/cpuGLVertexBuffer.h | 34 ++++++------- opensubdiv/osd/cpuKernel.cpp | 33 ++++++------ opensubdiv/osd/cpuKernel.h | 34 ++++++------- opensubdiv/osd/cpuVertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/cpuVertexBuffer.h | 34 ++++++------- opensubdiv/osd/cudaComputeContext.cpp | 33 ++++++------ opensubdiv/osd/cudaComputeContext.h | 34 ++++++------- opensubdiv/osd/cudaComputeController.cpp | 33 ++++++------ opensubdiv/osd/cudaComputeController.h | 34 ++++++------- opensubdiv/osd/cudaD3D11VertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/cudaD3D11VertexBuffer.h | 34 ++++++------- opensubdiv/osd/cudaGLVertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/cudaGLVertexBuffer.h | 35 ++++++------- opensubdiv/osd/cudaKernel.cu | 33 ++++++------ opensubdiv/osd/cudaVertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/cudaVertexBuffer.h | 34 ++++++------- opensubdiv/osd/d3d11ComputeContext.cpp | 33 ++++++------ opensubdiv/osd/d3d11ComputeContext.h | 34 ++++++------- opensubdiv/osd/d3d11ComputeController.cpp | 33 ++++++------ opensubdiv/osd/d3d11ComputeController.h | 34 ++++++------- opensubdiv/osd/d3d11DrawContext.cpp | 33 ++++++------ opensubdiv/osd/d3d11DrawContext.h | 34 ++++++------- opensubdiv/osd/d3d11DrawRegistry.cpp | 33 ++++++------ opensubdiv/osd/d3d11DrawRegistry.h | 34 ++++++------- opensubdiv/osd/d3d11KernelBundle.cpp | 33 ++++++------ opensubdiv/osd/d3d11KernelBundle.h | 34 ++++++------- opensubdiv/osd/d3d11Mesh.h | 34 ++++++------- opensubdiv/osd/d3d11PtexTexture.cpp | 33 ++++++------ opensubdiv/osd/d3d11PtexTexture.h | 35 ++++++------- opensubdiv/osd/d3d11VertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/d3d11VertexBuffer.h | 34 ++++++------- opensubdiv/osd/debug.h | 34 ++++++------- opensubdiv/osd/drawContext.cpp | 33 ++++++------ opensubdiv/osd/drawContext.h | 34 ++++++------- opensubdiv/osd/drawRegistry.cpp | 33 ++++++------ opensubdiv/osd/drawRegistry.h | 34 ++++++------- opensubdiv/osd/error.cpp | 33 ++++++------ opensubdiv/osd/error.h | 34 ++++++------- opensubdiv/osd/evalLimitContext.cpp | 33 ++++++------ opensubdiv/osd/evalLimitContext.h | 34 ++++++------- opensubdiv/osd/gcdComputeController.cpp | 33 ++++++------ opensubdiv/osd/gcdComputeController.h | 34 ++++++------- opensubdiv/osd/gcdKernel.cpp | 33 ++++++------ opensubdiv/osd/gcdKernel.h | 34 ++++++------- opensubdiv/osd/glDrawContext.cpp | 33 ++++++------ opensubdiv/osd/glDrawContext.h | 34 ++++++------- opensubdiv/osd/glDrawRegistry.cpp | 33 ++++++------ opensubdiv/osd/glDrawRegistry.h | 34 ++++++------- opensubdiv/osd/glMesh.h | 34 ++++++------- opensubdiv/osd/glPtexMipmapTexture.cpp | 33 ++++++------ opensubdiv/osd/glPtexMipmapTexture.h | 34 ++++++------- opensubdiv/osd/glPtexTexture.cpp | 33 ++++++------ opensubdiv/osd/glPtexTexture.h | 34 ++++++------- opensubdiv/osd/glVertexBuffer.cpp | 33 ++++++------ opensubdiv/osd/glVertexBuffer.h | 34 ++++++------- opensubdiv/osd/glslComputeContext.cpp | 33 ++++++------ opensubdiv/osd/glslComputeContext.h | 34 ++++++------- opensubdiv/osd/glslComputeController.cpp | 33 ++++++------ opensubdiv/osd/glslComputeController.h | 34 ++++++------- opensubdiv/osd/glslComputeKernel.glsl | 34 ++++++------- opensubdiv/osd/glslKernelBundle.cpp | 33 ++++++------ opensubdiv/osd/glslKernelBundle.h | 34 ++++++------- opensubdiv/osd/glslPatchBSpline.glsl | 34 ++++++------- opensubdiv/osd/glslPatchCommon.glsl | 34 ++++++------- opensubdiv/osd/glslPatchGregory.glsl | 33 ++++++------ opensubdiv/osd/glslPatchTransition.glsl | 33 ++++++------ .../glslTransformFeedbackComputeContext.cpp | 33 ++++++------ .../osd/glslTransformFeedbackComputeContext.h | 34 ++++++------- ...glslTransformFeedbackComputeController.cpp | 33 ++++++------ .../glslTransformFeedbackComputeController.h | 34 ++++++------- .../osd/glslTransformFeedbackKernel.glsl | 33 ++++++------ .../osd/glslTransformFeedbackKernelBundle.cpp | 33 ++++++------ .../osd/glslTransformFeedbackKernelBundle.h | 34 ++++++------- opensubdiv/osd/hlslComputeKernel.hlsl | 33 ++++++------ opensubdiv/osd/hlslPatchBSpline.hlsl | 33 ++++++------ opensubdiv/osd/hlslPatchCommon.hlsl | 33 ++++++------ opensubdiv/osd/hlslPatchGregory.hlsl | 33 ++++++------ opensubdiv/osd/hlslPatchTransition.hlsl | 33 ++++++------ opensubdiv/osd/mesh.h | 34 ++++++------- opensubdiv/osd/nonCopyable.h | 34 ++++++------- opensubdiv/osd/ompComputeController.cpp | 33 ++++++------ opensubdiv/osd/ompComputeController.h | 34 ++++++------- opensubdiv/osd/ompEvalStencilsController.cpp | 33 ++++++------ opensubdiv/osd/ompEvalStencilsController.h | 33 ++++++------ opensubdiv/osd/ompKernel.cpp | 33 ++++++------ opensubdiv/osd/ompKernel.h | 34 ++++++------- opensubdiv/osd/opengl.h | 34 ++++++------- opensubdiv/osd/ptexMipmapTextureLoader.cpp | 33 ++++++------ opensubdiv/osd/ptexMipmapTextureLoader.h | 34 ++++++------- opensubdiv/osd/ptexTextureLoader.cpp | 33 ++++++------ opensubdiv/osd/ptexTextureLoader.h | 34 ++++++------- opensubdiv/osd/tbbComputeController.cpp | 33 ++++++------ opensubdiv/osd/tbbComputeController.h | 33 ++++++------ opensubdiv/osd/tbbEvalStencilsController.cpp | 33 ++++++------ opensubdiv/osd/tbbEvalStencilsController.h | 33 ++++++------ opensubdiv/osd/tbbKernel.cpp | 33 ++++++------ opensubdiv/osd/tbbKernel.h | 33 ++++++------ opensubdiv/osd/vertex.h | 34 ++++++------- opensubdiv/osd/vertexDescriptor.h | 34 ++++++------- opensubdiv/osdutil/CMakeLists.txt | 33 ++++++------ opensubdiv/osdutil/batch.h | 34 ++++++------- opensubdiv/osdutil/batchCL.h | 35 ++++++------- opensubdiv/osdutil/drawController.h | 34 ++++++------- opensubdiv/osdutil/drawItem.h | 34 ++++++------- opensubdiv/tools/stringify/CMakeLists.txt | 33 ++++++------ opensubdiv/tools/stringify/main.cpp | 33 ++++++------ opensubdiv/version.h | 33 ++++++------ python/CMakeLists.txt | 33 ++++++------ python/doc/Makefile | 24 +++++++++ python/doc/conf.py | 33 ++++++------ python/doc/index.rst | 24 +++++++++ python/osd/__init__.py | 33 ++++++------ python/osd/adapters.py | 33 ++++++------ python/osd/buffer.h | 33 ++++++------ python/osd/common.py | 33 ++++++------ python/osd/internal.h | 33 ++++++------ python/osd/osdshim.i | 33 ++++++------ python/osd/subdivider.cpp | 33 ++++++------ python/osd/subdivider.h | 33 ++++++------ python/osd/subdivider.py | 33 ++++++------ python/osd/topology.cpp | 33 ++++++------ python/osd/topology.h | 33 ++++++------ python/osd/topology.py | 33 ++++++------ python/setup.py | 33 ++++++------ python/test/__init__.py | 33 ++++++------ python/test/simple.py | 33 ++++++------ regression/CMakeLists.txt | 33 ++++++------ regression/common/shape_utils.h | 34 ++++++------- regression/far_regression/CMakeLists.txt | 33 ++++++------ .../far_regression/example_createMesh.py | 33 ++++++------ regression/far_regression/main.cpp | 33 ++++++------ regression/hbr_regression/CMakeLists.txt | 33 ++++++------ regression/hbr_regression/baseline.cpp | 33 ++++++------ regression/hbr_regression/init_shapes.h | 34 ++++++------- regression/hbr_regression/main.cpp | 33 ++++++------ regression/osd_regression/CMakeLists.txt | 33 ++++++------ regression/osd_regression/main.cpp | 33 ++++++------ regression/shapes/bilinear_cube.h | 34 ++++++------- regression/shapes/catmark_bishop.h | 34 ++++++------- regression/shapes/catmark_car.h | 34 ++++++------- regression/shapes/catmark_cube.h | 34 ++++++------- regression/shapes/catmark_cube_corner0.h | 34 ++++++------- regression/shapes/catmark_cube_corner1.h | 34 ++++++------- regression/shapes/catmark_cube_corner2.h | 34 ++++++------- regression/shapes/catmark_cube_corner3.h | 34 ++++++------- regression/shapes/catmark_cube_corner4.h | 34 ++++++------- regression/shapes/catmark_cube_creases0.h | 34 ++++++------- regression/shapes/catmark_cube_creases1.h | 34 ++++++------- regression/shapes/catmark_dart_edgecorner.h | 34 ++++++------- regression/shapes/catmark_dart_edgeonly.h | 34 ++++++------- regression/shapes/catmark_edgecorner.h | 34 ++++++------- regression/shapes/catmark_edgeonly.h | 34 ++++++------- regression/shapes/catmark_flap.h | 34 ++++++------- regression/shapes/catmark_flap2.h | 34 ++++++------- regression/shapes/catmark_gregory_test1.h | 34 ++++++------- regression/shapes/catmark_gregory_test2.h | 34 ++++++------- regression/shapes/catmark_gregory_test3.h | 34 ++++++------- regression/shapes/catmark_gregory_test4.h | 34 ++++++------- regression/shapes/catmark_helmet.h | 34 ++++++------- regression/shapes/catmark_hole_test1.h | 34 ++++++------- regression/shapes/catmark_hole_test2.h | 34 ++++++------- regression/shapes/catmark_pawn.h | 34 ++++++------- regression/shapes/catmark_pyramid.h | 34 ++++++------- regression/shapes/catmark_pyramid_creases0.h | 34 ++++++------- regression/shapes/catmark_pyramid_creases1.h | 34 ++++++------- regression/shapes/catmark_pyramid_creases2.h | 34 ++++++------- regression/shapes/catmark_rook.h | 34 ++++++------- regression/shapes/catmark_square_hedit0.h | 34 ++++++------- regression/shapes/catmark_square_hedit1.h | 34 ++++++------- regression/shapes/catmark_square_hedit2.h | 34 ++++++------- regression/shapes/catmark_square_hedit3.h | 34 ++++++------- regression/shapes/catmark_square_hedit4.h | 34 ++++++------- regression/shapes/catmark_tent.h | 34 ++++++------- regression/shapes/catmark_tent_creases0.h | 34 ++++++------- regression/shapes/catmark_tent_creases1.h | 34 ++++++------- regression/shapes/catmark_torus.h | 34 ++++++------- regression/shapes/catmark_torus_creases0.h | 34 ++++++------- regression/shapes/catmark_torus_creases1.h | 34 ++++++------- regression/shapes/loop_cube.h | 34 ++++++------- regression/shapes/loop_cube_creases0.h | 34 ++++++------- regression/shapes/loop_cube_creases1.h | 34 ++++++------- regression/shapes/loop_icosahedron.h | 34 ++++++------- regression/shapes/loop_saddle_edgecorner.h | 34 ++++++------- regression/shapes/loop_saddle_edgeonly.h | 34 ++++++------- regression/shapes/loop_triangle_edgecorner.h | 34 ++++++------- regression/shapes/loop_triangle_edgeonly.h | 34 ++++++------- 402 files changed, 6770 insertions(+), 6931 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b94fa555..4e4be190 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # project(OpenSubdiv) diff --git a/LICENSE.txt b/LICENSE.txt index aa7a70a3..c7533090 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,19 +1,7 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ + Modified Apache 2.0 License - MODIFICATION TO THE APACHE 2.0 LICENSE - - Section 6. Trademarks. of the APACHE 2.0 License is 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 to comply with Section 4(c) of - the License and to reproduce the content of the NOTICE file. - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. @@ -184,39 +172,3 @@ defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License with the above modification to - your work. - - To apply the Apache License with the above modification to your work, - attach the following boilerplate notice, with the fields enclosed by - brackets "[]"replaced with your own identifying information. (Don't - include the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. is 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 to comply with Section 4(c) of - the License and to reproduce 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/cmake/FindDXSDK.cmake b/cmake/FindDXSDK.cmake index d02e6032..9cb90fb6 100644 --- a/cmake/FindDXSDK.cmake +++ b/cmake/FindDXSDK.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # Try to find DirectX SDK. diff --git a/cmake/FindDocutils.cmake b/cmake/FindDocutils.cmake index 28b11ebf..93813607 100644 --- a/cmake/FindDocutils.cmake +++ b/cmake/FindDocutils.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # - Try to find the restructured text to HTML converter diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake index e6d8801f..9107e26d 100644 --- a/cmake/FindGLEW.cmake +++ b/cmake/FindGLEW.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # Try to find GLEW library and include path. diff --git a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake index 3a3271e2..7192c32e 100644 --- a/cmake/FindGLFW.cmake +++ b/cmake/FindGLFW.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # Try to find GLFW library and include path. diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake index 06466697..3573affa 100644 --- a/cmake/FindIlmBase.cmake +++ b/cmake/FindIlmBase.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # - Try to find the IlmBase library diff --git a/cmake/FindMaya.cmake b/cmake/FindMaya.cmake index 2a63487a..ce46e8f0 100644 --- a/cmake/FindMaya.cmake +++ b/cmake/FindMaya.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # - Maya finder module diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake index fe9ca55a..690ada7b 100644 --- a/cmake/FindOpenCL.cmake +++ b/cmake/FindOpenCL.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # - Try to find an OpenCL library diff --git a/cmake/FindOpenGLES.cmake b/cmake/FindOpenGLES.cmake index 408a88ec..8b72892b 100644 --- a/cmake/FindOpenGLES.cmake +++ b/cmake/FindOpenGLES.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # - Try to find OpenGLES diff --git a/cmake/FindPTex.cmake b/cmake/FindPTex.cmake index 99f5f04b..2ae95014 100644 --- a/cmake/FindPTex.cmake +++ b/cmake/FindPTex.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # Try to find PTex library and include path. diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake index e64b6d8b..f4249432 100644 --- a/cmake/FindTBB.cmake +++ b/cmake/FindTBB.cmake @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # - Try to find Intel's Threading Building Blocks diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index 38aa2d8b..603ace61 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # diff --git a/documentation/OpenSubdiv.doxy b/documentation/OpenSubdiv.doxy index 944fe2af..119392f3 100644 --- a/documentation/OpenSubdiv.doxy +++ b/documentation/OpenSubdiv.doxy @@ -1,4 +1,27 @@ # Doxyfile 1.8.4 +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. diff --git a/documentation/README b/documentation/README index 89065973..37686fb9 100644 --- a/documentation/README +++ b/documentation/README @@ -1,25 +1,24 @@ - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. ReST Documentation diff --git a/documentation/additional_resources.rst b/documentation/additional_resources.rst index c7f09f5d..a280ba4c 100644 --- a/documentation/additional_resources.rst +++ b/documentation/additional_resources.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Additional Resources diff --git a/documentation/api_overview.rst b/documentation/api_overview.rst index 66e6b326..f4c72aea 100644 --- a/documentation/api_overview.rst +++ b/documentation/api_overview.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. API Overview diff --git a/documentation/cmake_build.rst b/documentation/cmake_build.rst index 5ccedfb4..a25990e0 100644 --- a/documentation/cmake_build.rst +++ b/documentation/cmake_build.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Building with Cmake diff --git a/documentation/code_examples.rst b/documentation/code_examples.rst index 57800b2a..3382747e 100644 --- a/documentation/code_examples.rst +++ b/documentation/code_examples.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Code Examples diff --git a/documentation/css/default.css b/documentation/css/default.css index 2dc8bec9..8c740a93 100644 --- a/documentation/css/default.css +++ b/documentation/css/default.css @@ -1,26 +1,25 @@ /* - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. */ /*-------------------------------GENERAL STYLES-------------------------------*/ diff --git a/documentation/css/doxy.css b/documentation/css/doxy.css index 4726d369..e5481255 100644 --- a/documentation/css/doxy.css +++ b/documentation/css/doxy.css @@ -1,26 +1,25 @@ /* - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. */ #top { diff --git a/documentation/css/flavor.css b/documentation/css/flavor.css index 9870136f..64a2448c 100644 --- a/documentation/css/flavor.css +++ b/documentation/css/flavor.css @@ -1,26 +1,25 @@ /* - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. */ /* Basic Styles diff --git a/documentation/css/renderman-university.css b/documentation/css/renderman-university.css index 25ce8cf4..7a87f95e 100644 --- a/documentation/css/renderman-university.css +++ b/documentation/css/renderman-university.css @@ -1,26 +1,25 @@ /* - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. */ .coursewareBackground { background: #efefef; diff --git a/documentation/css/rst.css b/documentation/css/rst.css index 0f0abf21..fb978ed5 100644 --- a/documentation/css/rst.css +++ b/documentation/css/rst.css @@ -1,26 +1,25 @@ /* - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. */ diff --git a/documentation/dxviewer.rst b/documentation/dxviewer.rst index a822510b..ddac25c6 100644 --- a/documentation/dxviewer.rst +++ b/documentation/dxviewer.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. dxViewer diff --git a/documentation/far_overview.rst b/documentation/far_overview.rst index df399b7e..867ceb88 100644 --- a/documentation/far_overview.rst +++ b/documentation/far_overview.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. FAR Overview diff --git a/documentation/getting_started.rst b/documentation/getting_started.rst index d2b1cf29..f48d45c1 100644 --- a/documentation/getting_started.rst +++ b/documentation/getting_started.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Getting Started diff --git a/documentation/glbatchviewer.rst b/documentation/glbatchviewer.rst index 8213f73c..3e9c7596 100644 --- a/documentation/glbatchviewer.rst +++ b/documentation/glbatchviewer.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. glBatchViewer diff --git a/documentation/glstencilviewer.rst b/documentation/glstencilviewer.rst index 2b201f5f..a4abcdcd 100644 --- a/documentation/glstencilviewer.rst +++ b/documentation/glstencilviewer.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. glStencilViewer diff --git a/documentation/glviewer.rst b/documentation/glviewer.rst index 430d13d0..a8352fb6 100644 --- a/documentation/glviewer.rst +++ b/documentation/glviewer.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. glViewer diff --git a/documentation/hbr_overview.rst b/documentation/hbr_overview.rst index 410bd2e5..65f5f8a6 100644 --- a/documentation/hbr_overview.rst +++ b/documentation/hbr_overview.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. HBR Overview diff --git a/documentation/intro.rst b/documentation/intro.rst index b96511e2..e6e49272 100644 --- a/documentation/intro.rst +++ b/documentation/intro.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Introduction diff --git a/documentation/limiteval.rst b/documentation/limiteval.rst index 0335392d..350371eb 100644 --- a/documentation/limiteval.rst +++ b/documentation/limiteval.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. limitEval diff --git a/documentation/nav_template.txt b/documentation/nav_template.txt index 26737137..3e68a6ed 100644 --- a/documentation/nav_template.txt +++ b/documentation/nav_template.txt @@ -1,26 +1,25 @@
diff --git a/documentation/osd_overview.rst b/documentation/osd_overview.rst index 8949a2d4..c3e95584 100644 --- a/documentation/osd_overview.rst +++ b/documentation/osd_overview.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. OSD Overview diff --git a/documentation/painttest.rst b/documentation/painttest.rst index 851d3848..bddc6f9d 100644 --- a/documentation/painttest.rst +++ b/documentation/painttest.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. paintTest diff --git a/documentation/processHtml.py b/documentation/processHtml.py index 76011984..1a81df59 100755 --- a/documentation/processHtml.py +++ b/documentation/processHtml.py @@ -1,27 +1,26 @@ #!/usr/bin/env python # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # import os diff --git a/documentation/ptexviewer.rst b/documentation/ptexviewer.rst index d3a2bc5f..cf2429c9 100644 --- a/documentation/ptexviewer.rst +++ b/documentation/ptexviewer.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. ptexViewer diff --git a/documentation/release_notes.rst b/documentation/release_notes.rst index a0c27f1c..83d33083 100644 --- a/documentation/release_notes.rst +++ b/documentation/release_notes.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Release Notes diff --git a/documentation/search.html b/documentation/search.html index e1dfb9bb..ce0ba0af 100644 --- a/documentation/search.html +++ b/documentation/search.html @@ -1,27 +1,26 @@ diff --git a/documentation/subdivision_surfaces.rst b/documentation/subdivision_surfaces.rst index 3bffa803..8c953203 100644 --- a/documentation/subdivision_surfaces.rst +++ b/documentation/subdivision_surfaces.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Subdivision Surfaces diff --git a/documentation/using_osd.rst b/documentation/using_osd.rst index 0117ec7b..dc634826 100644 --- a/documentation/using_osd.rst +++ b/documentation/using_osd.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Using OpenSubdiv diff --git a/documentation/using_osd_compile.rst b/documentation/using_osd_compile.rst index ad4a2a73..2cc318c0 100644 --- a/documentation/using_osd_compile.rst +++ b/documentation/using_osd_compile.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Using OpenSubdiv diff --git a/documentation/using_osd_hbr.rst b/documentation/using_osd_hbr.rst index 57c7d2f4..dc167823 100644 --- a/documentation/using_osd_hbr.rst +++ b/documentation/using_osd_hbr.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Using Hbr diff --git a/documentation/using_osd_textures.rst b/documentation/using_osd_textures.rst index 73748145..7d969235 100644 --- a/documentation/using_osd_textures.rst +++ b/documentation/using_osd_textures.rst @@ -1,26 +1,25 @@ .. - 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. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. Using Textures diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 6c198a31..7b808834 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # if( OPENGL_FOUND AND (GLEW_FOUND AND GLFW_FOUND) OR (APPLE AND GLFW_FOUND)) diff --git a/examples/common/clInit.h b/examples/common/clInit.h index 550b080d..38d353c4 100644 --- a/examples/common/clInit.h +++ b/examples/common/clInit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_EXAMPLE_CL_INIT_H #define OSD_EXAMPLE_CL_INIT_H diff --git a/examples/common/cudaInit.h b/examples/common/cudaInit.h index b1b8a9c1..2eae7fba 100644 --- a/examples/common/cudaInit.h +++ b/examples/common/cudaInit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CUDA_INIT_H #define OSD_CUDA_INIT_H diff --git a/examples/common/d3d11_compile.h b/examples/common/d3d11_compile.h index f86090a8..2340a03b 100644 --- a/examples/common/d3d11_compile.h +++ b/examples/common/d3d11_compile.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef D3D11_COMPILE_H #define D3D11_COMPILE_H diff --git a/examples/common/d3d11_hud.cpp b/examples/common/d3d11_hud.cpp index 87998099..fad96e73 100644 --- a/examples/common/d3d11_hud.cpp +++ b/examples/common/d3d11_hud.cpp @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #include #include #include diff --git a/examples/common/d3d11_hud.h b/examples/common/d3d11_hud.h index bfdf703d..db1fd26f 100644 --- a/examples/common/d3d11_hud.h +++ b/examples/common/d3d11_hud.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef D3D11_HUD_H #define D3D11_HUD_H diff --git a/examples/common/export_obj.py b/examples/common/export_obj.py index 6d30e0a9..d8c514f0 100644 --- a/examples/common/export_obj.py +++ b/examples/common/export_obj.py @@ -1,27 +1,27 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # + import maya.OpenMaya as OpenMaya selectionList = OpenMaya.MSelectionList() diff --git a/examples/common/font_image.cpp b/examples/common/font_image.cpp index 46323125..e4097cb4 100644 --- a/examples/common/font_image.cpp +++ b/examples/common/font_image.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // unsigned char font_image[] = { diff --git a/examples/common/font_image.h b/examples/common/font_image.h index 159b5ad1..88d8ed33 100644 --- a/examples/common/font_image.h +++ b/examples/common/font_image.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FONT_IMAGE_H diff --git a/examples/common/gl_hud.cpp b/examples/common/gl_hud.cpp index efb63f9b..c2cfc960 100644 --- a/examples/common/gl_hud.cpp +++ b/examples/common/gl_hud.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "gl_hud.h" diff --git a/examples/common/gl_hud.h b/examples/common/gl_hud.h index 95040220..1270988c 100644 --- a/examples/common/gl_hud.h +++ b/examples/common/gl_hud.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef GL_HUD_H #define GL_HUD_H diff --git a/examples/common/hdr_reader.cpp b/examples/common/hdr_reader.cpp index 148bb810..9165d726 100644 --- a/examples/common/hdr_reader.cpp +++ b/examples/common/hdr_reader.cpp @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #include #include #include diff --git a/examples/common/hdr_reader.h b/examples/common/hdr_reader.h index 02205c3b..243e7f0e 100644 --- a/examples/common/hdr_reader.h +++ b/examples/common/hdr_reader.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #define HDR_X_MAJOR (1 << 0) diff --git a/examples/common/hud.cpp b/examples/common/hud.cpp index fea8d634..623b2989 100644 --- a/examples/common/hud.cpp +++ b/examples/common/hud.cpp @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #include #include #include diff --git a/examples/common/hud.h b/examples/common/hud.h index a27f768c..ba775ddc 100644 --- a/examples/common/hud.h +++ b/examples/common/hud.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HUD_H #define HUD_H diff --git a/examples/common/maya_util.h b/examples/common/maya_util.h index fb8134fe..37131415 100644 --- a/examples/common/maya_util.h +++ b/examples/common/maya_util.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef _EXAMPLE_MAYA_UTIL_H_ #define _EXAMPLE_MAYA_UTIL_H_ diff --git a/examples/common/patchColors.cpp b/examples/common/patchColors.cpp index 2dc0cf0c..a2658b71 100644 --- a/examples/common/patchColors.cpp +++ b/examples/common/patchColors.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "patchColors.h" diff --git a/examples/common/patchColors.h b/examples/common/patchColors.h index ac2437a8..bfbeca74 100644 --- a/examples/common/patchColors.h +++ b/examples/common/patchColors.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef COMMON_PATCH_COLORS_H #define COMMON_PATCH_COLORS_H diff --git a/examples/common/simple_math.h b/examples/common/simple_math.h index 0fb2ce59..21f52077 100644 --- a/examples/common/simple_math.h +++ b/examples/common/simple_math.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef SIMPLE_MATH_H #define SIMPLE_MATH_H diff --git a/examples/common/stopwatch.h b/examples/common/stopwatch.h index 00e384c5..1a58fec3 100644 --- a/examples/common/stopwatch.h +++ b/examples/common/stopwatch.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef STOPWATCH_H diff --git a/examples/dxViewer/CMakeLists.txt b/examples/dxViewer/CMakeLists.txt index 55090854..46215d97 100644 --- a/examples/dxViewer/CMakeLists.txt +++ b/examples/dxViewer/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** dxViewer *** diff --git a/examples/dxViewer/dxviewer.cpp b/examples/dxViewer/dxviewer.cpp index 19d55817..bf4d42e2 100644 --- a/examples/dxViewer/dxviewer.cpp +++ b/examples/dxViewer/dxviewer.cpp @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #include #include diff --git a/examples/dxViewer/shader.hlsl b/examples/dxViewer/shader.hlsl index 515f4907..3f8a74f7 100644 --- a/examples/dxViewer/shader.hlsl +++ b/examples/dxViewer/shader.hlsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // struct OutputPointVertex { diff --git a/examples/glBatchViewer/CMakeLists.txt b/examples/glBatchViewer/CMakeLists.txt index 6d0707f8..9a34a838 100644 --- a/examples/glBatchViewer/CMakeLists.txt +++ b/examples/glBatchViewer/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** glViewer *** diff --git a/examples/glBatchViewer/delegate.cpp b/examples/glBatchViewer/delegate.cpp index 666ca493..b3810d8f 100644 --- a/examples/glBatchViewer/delegate.cpp +++ b/examples/glBatchViewer/delegate.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "delegate.h" diff --git a/examples/glBatchViewer/delegate.h b/examples/glBatchViewer/delegate.h index feed67d9..155c4b2e 100644 --- a/examples/glBatchViewer/delegate.h +++ b/examples/glBatchViewer/delegate.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef DELEGATE_H #define DELEGATE_H diff --git a/examples/glBatchViewer/effect.cpp b/examples/glBatchViewer/effect.cpp index 8fbb899b..b73afa45 100644 --- a/examples/glBatchViewer/effect.cpp +++ b/examples/glBatchViewer/effect.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "effect.h" diff --git a/examples/glBatchViewer/effect.h b/examples/glBatchViewer/effect.h index b1d5f5d6..8a3a2804 100644 --- a/examples/glBatchViewer/effect.h +++ b/examples/glBatchViewer/effect.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef EFFECT_H #define EFFECT_H diff --git a/examples/glBatchViewer/effectRegistry.cpp b/examples/glBatchViewer/effectRegistry.cpp index 7713cb6d..224fa65d 100644 --- a/examples/glBatchViewer/effectRegistry.cpp +++ b/examples/glBatchViewer/effectRegistry.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "effectRegistry.h" diff --git a/examples/glBatchViewer/effectRegistry.h b/examples/glBatchViewer/effectRegistry.h index b6ba56ee..dd32db8f 100644 --- a/examples/glBatchViewer/effectRegistry.h +++ b/examples/glBatchViewer/effectRegistry.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef EFFECT_REGISTRY_H #define EFFECT_REGISTRY_H diff --git a/examples/glBatchViewer/shader.glsl b/examples/glBatchViewer/shader.glsl index 5a6e5b65..5434618e 100644 --- a/examples/glBatchViewer/shader.glsl +++ b/examples/glBatchViewer/shader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #line 57 diff --git a/examples/glBatchViewer/shader_gl3.glsl b/examples/glBatchViewer/shader_gl3.glsl index ab32ce51..8d031f25 100644 --- a/examples/glBatchViewer/shader_gl3.glsl +++ b/examples/glBatchViewer/shader_gl3.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // layout(std140) uniform Transform { diff --git a/examples/glBatchViewer/shapes.h b/examples/glBatchViewer/shapes.h index 542feb6f..82f6d7dd 100644 --- a/examples/glBatchViewer/shapes.h +++ b/examples/glBatchViewer/shapes.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // void initializeShapes( ) { diff --git a/examples/glBatchViewer/viewer.cpp b/examples/glBatchViewer/viewer.cpp index e0a3eb35..210d8996 100644 --- a/examples/glBatchViewer/viewer.cpp +++ b/examples/glBatchViewer/viewer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/examples/glStencilViewer/CMakeLists.txt b/examples/glStencilViewer/CMakeLists.txt index 6d0c0e23..6e87d490 100644 --- a/examples/glStencilViewer/CMakeLists.txt +++ b/examples/glStencilViewer/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** glStencilViewer *** diff --git a/examples/glStencilViewer/main.cpp b/examples/glStencilViewer/main.cpp index 4df1fbe6..0c4c6b35 100644 --- a/examples/glStencilViewer/main.cpp +++ b/examples/glStencilViewer/main.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/examples/glViewer/CMakeLists.txt b/examples/glViewer/CMakeLists.txt index 9ba22883..70054e64 100644 --- a/examples/glViewer/CMakeLists.txt +++ b/examples/glViewer/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** glViewer *** diff --git a/examples/glViewer/shader.glsl b/examples/glViewer/shader.glsl index 861155b1..f594b7e8 100644 --- a/examples/glViewer/shader.glsl +++ b/examples/glViewer/shader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(VARYING_COLOR) || defined(FACEVARYING_COLOR) diff --git a/examples/glViewer/shader_gl3.glsl b/examples/glViewer/shader_gl3.glsl index 369d6a20..95abe067 100644 --- a/examples/glViewer/shader_gl3.glsl +++ b/examples/glViewer/shader_gl3.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // layout(std140) uniform Transform { diff --git a/examples/glViewer/viewer.cpp b/examples/glViewer/viewer.cpp index ab490a45..397a5bb1 100644 --- a/examples/glViewer/viewer.cpp +++ b/examples/glViewer/viewer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/examples/limitEval/CMakeLists.txt b/examples/limitEval/CMakeLists.txt index 8a57fdd9..d80d0b6b 100644 --- a/examples/limitEval/CMakeLists.txt +++ b/examples/limitEval/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** glViewer *** diff --git a/examples/limitEval/main.cpp b/examples/limitEval/main.cpp index b6c1dc13..67a9e9aa 100644 --- a/examples/limitEval/main.cpp +++ b/examples/limitEval/main.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/examples/mayaPtexViewer/AEopenSubdivPtexShaderTemplate.mel b/examples/mayaPtexViewer/AEopenSubdivPtexShaderTemplate.mel index 91dbe699..69ed9141 100644 --- a/examples/mayaPtexViewer/AEopenSubdivPtexShaderTemplate.mel +++ b/examples/mayaPtexViewer/AEopenSubdivPtexShaderTemplate.mel @@ -1,3 +1,26 @@ +// +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. +// +// You may obtain a copy of the Apache License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. +// // // Common utilities for map file attributes diff --git a/examples/mayaPtexViewer/CMakeLists.txt b/examples/mayaPtexViewer/CMakeLists.txt index 0ea81684..5f9d7ec0 100644 --- a/examples/mayaPtexViewer/CMakeLists.txt +++ b/examples/mayaPtexViewer/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** mayaPtexViewer *** diff --git a/examples/mayaPtexViewer/OpenSubdivPtexShader.cpp b/examples/mayaPtexViewer/OpenSubdivPtexShader.cpp index 539fa2e8..84d7e03a 100644 --- a/examples/mayaPtexViewer/OpenSubdivPtexShader.cpp +++ b/examples/mayaPtexViewer/OpenSubdivPtexShader.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if not defined(__APPLE__) diff --git a/examples/mayaPtexViewer/OpenSubdivPtexShader.h b/examples/mayaPtexViewer/OpenSubdivPtexShader.h index 23cd405a..d1978414 100644 --- a/examples/mayaPtexViewer/OpenSubdivPtexShader.h +++ b/examples/mayaPtexViewer/OpenSubdivPtexShader.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef EXAMPLES_MAYAPTEXVIEWER_OPENSUBDIVPTEXSHADER_H_ #define EXAMPLES_MAYAPTEXVIEWER_OPENSUBDIVPTEXSHADER_H_ diff --git a/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.cpp b/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.cpp index 7d781d23..d76e74b9 100644 --- a/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.cpp +++ b/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if not defined(__APPLE__) diff --git a/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.h b/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.h index 9fe8b964..85176beb 100644 --- a/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.h +++ b/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef EXAMPLES_MAYAPTEXVIEWER_OPENSUBDIVPTEXSHADEROVERRIDE_H_ diff --git a/examples/mayaPtexViewer/cudaUtil.cpp b/examples/mayaPtexViewer/cudaUtil.cpp index d0998dcf..e6b47a85 100644 --- a/examples/mayaPtexViewer/cudaUtil.cpp +++ b/examples/mayaPtexViewer/cudaUtil.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifdef OPENSUBDIV_HAS_CUDA diff --git a/examples/mayaPtexViewer/hbrUtil.cpp b/examples/mayaPtexViewer/hbrUtil.cpp index fd21f03b..8691275f 100644 --- a/examples/mayaPtexViewer/hbrUtil.cpp +++ b/examples/mayaPtexViewer/hbrUtil.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "hbrUtil.h" diff --git a/examples/mayaPtexViewer/hbrUtil.h b/examples/mayaPtexViewer/hbrUtil.h index d7f4fdc7..4fafda41 100644 --- a/examples/mayaPtexViewer/hbrUtil.h +++ b/examples/mayaPtexViewer/hbrUtil.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef EXAMPLES_MAYAVIEWER_HBRUTIL_H_ #define EXAMPLES_MAYAVIEWER_HBRUTIL_H_ diff --git a/examples/mayaPtexViewer/osdPtexMeshData.cpp b/examples/mayaPtexViewer/osdPtexMeshData.cpp index b2500659..93b63baa 100644 --- a/examples/mayaPtexViewer/osdPtexMeshData.cpp +++ b/examples/mayaPtexViewer/osdPtexMeshData.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if not defined(__APPLE__) diff --git a/examples/mayaPtexViewer/osdPtexMeshData.h b/examples/mayaPtexViewer/osdPtexMeshData.h index e597a7ca..8c0adf66 100644 --- a/examples/mayaPtexViewer/osdPtexMeshData.h +++ b/examples/mayaPtexViewer/osdPtexMeshData.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef EXAMPLES_MAYAPTEXVIEWER_OSDPTEXMESHDATA_H_ #define EXAMPLES_MAYAPTEXVIEWER_OSDPTEXMESHDATA_H_ diff --git a/examples/mayaPtexViewer/shader.glsl b/examples/mayaPtexViewer/shader.glsl index 853f0b34..0b6cecbb 100644 --- a/examples/mayaPtexViewer/shader.glsl +++ b/examples/mayaPtexViewer/shader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #line 57 diff --git a/examples/mayaViewer/AEopenSubdivShaderTemplate.mel b/examples/mayaViewer/AEopenSubdivShaderTemplate.mel index b984313f..aeff36f8 100644 --- a/examples/mayaViewer/AEopenSubdivShaderTemplate.mel +++ b/examples/mayaViewer/AEopenSubdivShaderTemplate.mel @@ -1,3 +1,26 @@ +// +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. +// +// You may obtain a copy of the Apache License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. +// // // Common utilities for map file attributes diff --git a/examples/mayaViewer/CMakeLists.txt b/examples/mayaViewer/CMakeLists.txt index 7e4585d9..c441496d 100644 --- a/examples/mayaViewer/CMakeLists.txt +++ b/examples/mayaViewer/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** mayaViewer *** diff --git a/examples/mayaViewer/OpenSubdivShader.cpp b/examples/mayaViewer/OpenSubdivShader.cpp index 5f64c300..50fabb14 100644 --- a/examples/mayaViewer/OpenSubdivShader.cpp +++ b/examples/mayaViewer/OpenSubdivShader.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/examples/mayaViewer/OpenSubdivShader.h b/examples/mayaViewer/OpenSubdivShader.h index 4ac92bb4..2f124a64 100644 --- a/examples/mayaViewer/OpenSubdivShader.h +++ b/examples/mayaViewer/OpenSubdivShader.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef EXAMPLES_MAYAVIEWER_OPENSUBDIVSHADER_H_ diff --git a/examples/mayaViewer/OpenSubdivShaderOverride.cpp b/examples/mayaViewer/OpenSubdivShaderOverride.cpp index 2b1702af..e2fc9666 100644 --- a/examples/mayaViewer/OpenSubdivShaderOverride.cpp +++ b/examples/mayaViewer/OpenSubdivShaderOverride.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // // ### OpenSubdivShaderOverride.cpp diff --git a/examples/mayaViewer/OpenSubdivShaderOverride.h b/examples/mayaViewer/OpenSubdivShaderOverride.h index d945d28e..03793c36 100644 --- a/examples/mayaViewer/OpenSubdivShaderOverride.h +++ b/examples/mayaViewer/OpenSubdivShaderOverride.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef EXAMPLES_MAYAVIEWER_OPENSUBDIVSHADEROVERRIDE_H_ diff --git a/examples/mayaViewer/cudaUtil.cpp b/examples/mayaViewer/cudaUtil.cpp index d0998dcf..e6b47a85 100644 --- a/examples/mayaViewer/cudaUtil.cpp +++ b/examples/mayaViewer/cudaUtil.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifdef OPENSUBDIV_HAS_CUDA diff --git a/examples/mayaViewer/hbrUtil.cpp b/examples/mayaViewer/hbrUtil.cpp index 05e4ba55..947eea02 100644 --- a/examples/mayaViewer/hbrUtil.cpp +++ b/examples/mayaViewer/hbrUtil.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "hbrUtil.h" diff --git a/examples/mayaViewer/hbrUtil.h b/examples/mayaViewer/hbrUtil.h index d7f4fdc7..4fafda41 100644 --- a/examples/mayaViewer/hbrUtil.h +++ b/examples/mayaViewer/hbrUtil.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef EXAMPLES_MAYAVIEWER_HBRUTIL_H_ #define EXAMPLES_MAYAVIEWER_HBRUTIL_H_ diff --git a/examples/mayaViewer/mayaViewer.cpp b/examples/mayaViewer/mayaViewer.cpp index 7cb3e405..48c28787 100644 --- a/examples/mayaViewer/mayaViewer.cpp +++ b/examples/mayaViewer/mayaViewer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // diff --git a/examples/mayaViewer/osdMeshData.cpp b/examples/mayaViewer/osdMeshData.cpp index 2dfe493c..c433b9bb 100644 --- a/examples/mayaViewer/osdMeshData.cpp +++ b/examples/mayaViewer/osdMeshData.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/examples/mayaViewer/osdMeshData.h b/examples/mayaViewer/osdMeshData.h index a5e624da..679497c9 100644 --- a/examples/mayaViewer/osdMeshData.h +++ b/examples/mayaViewer/osdMeshData.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef EXAMPLES_MAYAVIEWER_OSDMESHDATA_H_ #define EXAMPLES_MAYAVIEWER_OSDMESHDATA_H_ diff --git a/examples/mayaViewer/shader.glsl b/examples/mayaViewer/shader.glsl index 5759ce45..3333608f 100644 --- a/examples/mayaViewer/shader.glsl +++ b/examples/mayaViewer/shader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #line 57 diff --git a/examples/paintTest/CMakeLists.txt b/examples/paintTest/CMakeLists.txt index 6e6e244f..ac2bbf66 100644 --- a/examples/paintTest/CMakeLists.txt +++ b/examples/paintTest/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** paintTest *** diff --git a/examples/paintTest/main.cpp b/examples/paintTest/main.cpp index 1e741ffb..e0881fc9 100644 --- a/examples/paintTest/main.cpp +++ b/examples/paintTest/main.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/examples/paintTest/paintShader.glsl b/examples/paintTest/paintShader.glsl index 73ff6a88..8c44544c 100644 --- a/examples/paintTest/paintShader.glsl +++ b/examples/paintTest/paintShader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #line 58 diff --git a/examples/paintTest/shader.glsl b/examples/paintTest/shader.glsl index 3a81b575..a6246931 100644 --- a/examples/paintTest/shader.glsl +++ b/examples/paintTest/shader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // vec4 PTexLookup(vec4 patchCoord, diff --git a/examples/ptexViewer/CMakeLists.txt b/examples/ptexViewer/CMakeLists.txt index ef5064bb..4ec36b9a 100644 --- a/examples/ptexViewer/CMakeLists.txt +++ b/examples/ptexViewer/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** ptexViewer *** diff --git a/examples/ptexViewer/imageshader.glsl b/examples/ptexViewer/imageshader.glsl index bb897478..0a6b9bcf 100644 --- a/examples/ptexViewer/imageshader.glsl +++ b/examples/ptexViewer/imageshader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // //-------------------------------------------------------------- diff --git a/examples/ptexViewer/shader.glsl b/examples/ptexViewer/shader.glsl index f352e5c2..fdc5d73c 100644 --- a/examples/ptexViewer/shader.glsl +++ b/examples/ptexViewer/shader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #line 25 //-------------------------------------------------------------- diff --git a/examples/ptexViewer/shader_gl3.glsl b/examples/ptexViewer/shader_gl3.glsl index 8ba021e5..7bac9eeb 100644 --- a/examples/ptexViewer/shader_gl3.glsl +++ b/examples/ptexViewer/shader_gl3.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // layout(std140) uniform Transform { diff --git a/examples/ptexViewer/skyshader.glsl b/examples/ptexViewer/skyshader.glsl index 9bedb244..3af08640 100644 --- a/examples/ptexViewer/skyshader.glsl +++ b/examples/ptexViewer/skyshader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // //-------------------------------------------------------------- diff --git a/examples/ptexViewer/viewer.cpp b/examples/ptexViewer/viewer.cpp index e26f372f..14778349 100644 --- a/examples/ptexViewer/viewer.cpp +++ b/examples/ptexViewer/viewer.cpp @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #if defined(__APPLE__) #if defined(OSD_USES_GLEW) #include diff --git a/examples/python/__init__.py b/examples/python/__init__.py index 24b46bef..4908fa29 100644 --- a/examples/python/__init__.py +++ b/examples/python/__init__.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from main import main diff --git a/examples/python/canvas.py b/examples/python/canvas.py index 40160bd6..92585ee9 100644 --- a/examples/python/canvas.py +++ b/examples/python/canvas.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from PyQt4 import QtCore diff --git a/examples/python/interactive.py b/examples/python/interactive.py index d67d5077..6612ddee 100644 --- a/examples/python/interactive.py +++ b/examples/python/interactive.py @@ -1,27 +1,26 @@ #!/usr/bin/env python # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from PyQt4 import QtGui, QtCore diff --git a/examples/python/main.py b/examples/python/main.py index f3313662..b173c400 100644 --- a/examples/python/main.py +++ b/examples/python/main.py @@ -1,28 +1,28 @@ #!/usr/bin/env python # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # + from PyQt4 import QtGui, QtCore from window import Window from renderer import Renderer diff --git a/examples/python/renderer.py b/examples/python/renderer.py index 94445f41..76f1e07d 100644 --- a/examples/python/renderer.py +++ b/examples/python/renderer.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # import math diff --git a/examples/python/shaders.py b/examples/python/shaders.py index 43910548..a9e9c491 100644 --- a/examples/python/shaders.py +++ b/examples/python/shaders.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from OpenGL.GL import * diff --git a/examples/python/simple.glsl b/examples/python/simple.glsl index 38310565..f8b72706 100644 --- a/examples/python/simple.glsl +++ b/examples/python/simple.glsl @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # -- xforms diff --git a/examples/python/utility.py b/examples/python/utility.py index b5691ed7..ac2a7d43 100644 --- a/examples/python/utility.py +++ b/examples/python/utility.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from OpenGL.GL import * diff --git a/examples/python/window.py b/examples/python/window.py index 22458088..a1c3ada7 100644 --- a/examples/python/window.py +++ b/examples/python/window.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from PyQt4 import QtGui, QtCore diff --git a/examples/simpleCpu/CMakeLists.txt b/examples/simpleCpu/CMakeLists.txt index d16e96ce..f6251ede 100644 --- a/examples/simpleCpu/CMakeLists.txt +++ b/examples/simpleCpu/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** simpleCpu *** diff --git a/examples/simpleCpu/algebra.h b/examples/simpleCpu/algebra.h index f8f1b718..f5341288 100644 --- a/examples/simpleCpu/algebra.h +++ b/examples/simpleCpu/algebra.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #pragma once #include diff --git a/examples/simpleCpu/glhelpers.h b/examples/simpleCpu/glhelpers.h index 19285e91..582a5486 100644 --- a/examples/simpleCpu/glhelpers.h +++ b/examples/simpleCpu/glhelpers.h @@ -1,26 +1,26 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // -// 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. // This file contains standard OpenGL API calls that are mostly uninteresting if // you are purely trying to learn OSD. The following operations are implemented diff --git a/examples/simpleCpu/main.cpp b/examples/simpleCpu/main.cpp index 2835d22f..73025c5f 100644 --- a/examples/simpleCpu/main.cpp +++ b/examples/simpleCpu/main.cpp @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #if defined(__APPLE__) #if defined(OSD_USES_GLEW) #include diff --git a/examples/simpleCpu/shader.glsl b/examples/simpleCpu/shader.glsl index ae844ffa..b71a113e 100644 --- a/examples/simpleCpu/shader.glsl +++ b/examples/simpleCpu/shader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // //#version 330 diff --git a/examples/simpleCpu/simpleCpuSubdivision.cpp b/examples/simpleCpu/simpleCpuSubdivision.cpp index 4ea3a870..cf151ab6 100644 --- a/examples/simpleCpu/simpleCpuSubdivision.cpp +++ b/examples/simpleCpu/simpleCpuSubdivision.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // // CPU Subdivision with OpenSubdiv diff --git a/examples/simpleCpu/simpleCpuSubdivision_org.cpp b/examples/simpleCpu/simpleCpuSubdivision_org.cpp index 22da069b..868f2a15 100644 --- a/examples/simpleCpu/simpleCpuSubdivision_org.cpp +++ b/examples/simpleCpu/simpleCpuSubdivision_org.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // // CPU Subdivision with OpenSubdiv diff --git a/examples/uvViewer/CMakeLists.txt b/examples/uvViewer/CMakeLists.txt index 043ee6fd..b2137102 100644 --- a/examples/uvViewer/CMakeLists.txt +++ b/examples/uvViewer/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # *** uvViewer *** diff --git a/examples/uvViewer/shader.glsl b/examples/uvViewer/shader.glsl index 1329a072..de982f9a 100644 --- a/examples/uvViewer/shader.glsl +++ b/examples/uvViewer/shader.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #undef OSD_USER_VARYING_DECLARE diff --git a/examples/uvViewer/viewer.cpp b/examples/uvViewer/viewer.cpp index f0cbee42..f8f885ec 100644 --- a/examples/uvViewer/viewer.cpp +++ b/examples/uvViewer/viewer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt index 151187ce..d0c2b29c 100644 --- a/opensubdiv/CMakeLists.txt +++ b/opensubdiv/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # if(OPENGL_FOUND OR OPENCL_FOUND OR DXSDK_FOUND OR CUDA_FOUND) diff --git a/opensubdiv/far/CMakeLists.txt b/opensubdiv/far/CMakeLists.txt index be74a193..ec50f235 100644 --- a/opensubdiv/far/CMakeLists.txt +++ b/opensubdiv/far/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # #------------------------------------------------------------------------------- diff --git a/opensubdiv/far/bilinearSubdivisionTables.h b/opensubdiv/far/bilinearSubdivisionTables.h index 54f335eb..32eb19bf 100644 --- a/opensubdiv/far/bilinearSubdivisionTables.h +++ b/opensubdiv/far/bilinearSubdivisionTables.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_BILINEAR_SUBDIVISION_TABLES_H diff --git a/opensubdiv/far/bilinearSubdivisionTablesFactory.h b/opensubdiv/far/bilinearSubdivisionTablesFactory.h index fa6e4fc1..73cb01de 100644 --- a/opensubdiv/far/bilinearSubdivisionTablesFactory.h +++ b/opensubdiv/far/bilinearSubdivisionTablesFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_BILINEAR_SUBDIVISION_TABLES_FACTORY_H diff --git a/opensubdiv/far/catmarkSubdivisionTables.h b/opensubdiv/far/catmarkSubdivisionTables.h index 0bec9d6a..6aafb886 100644 --- a/opensubdiv/far/catmarkSubdivisionTables.h +++ b/opensubdiv/far/catmarkSubdivisionTables.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_CATMARK_SUBDIVISION_TABLES_H diff --git a/opensubdiv/far/catmarkSubdivisionTablesFactory.h b/opensubdiv/far/catmarkSubdivisionTablesFactory.h index 8e6bb331..b8aaec17 100644 --- a/opensubdiv/far/catmarkSubdivisionTablesFactory.h +++ b/opensubdiv/far/catmarkSubdivisionTablesFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_CATMARK_SUBDIVISION_TABLES_FACTORY_H diff --git a/opensubdiv/far/dispatcher.h b/opensubdiv/far/dispatcher.h index 9a941285..83267e3a 100644 --- a/opensubdiv/far/dispatcher.h +++ b/opensubdiv/far/dispatcher.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef FAR_DISPATCHER_H #define FAR_DISPATCHER_H diff --git a/opensubdiv/far/kernelBatch.h b/opensubdiv/far/kernelBatch.h index 9cde7427..97e31963 100644 --- a/opensubdiv/far/kernelBatch.h +++ b/opensubdiv/far/kernelBatch.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef FAR_KERNEL_BATCH_H #define FAR_KERNEL_BATCH_H diff --git a/opensubdiv/far/kernelBatchFactory.h b/opensubdiv/far/kernelBatchFactory.h index a3d8c027..9ed65524 100644 --- a/opensubdiv/far/kernelBatchFactory.h +++ b/opensubdiv/far/kernelBatchFactory.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef FAR_KERNEL_BATCH_FACTORY_H #define FAR_KERNEL_BATCH_FACTORY_H diff --git a/opensubdiv/far/loopSubdivisionTables.h b/opensubdiv/far/loopSubdivisionTables.h index 27957e8a..ee04a4d1 100644 --- a/opensubdiv/far/loopSubdivisionTables.h +++ b/opensubdiv/far/loopSubdivisionTables.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_LOOP_SUBDIVISION_TABLES_H diff --git a/opensubdiv/far/loopSubdivisionTablesFactory.h b/opensubdiv/far/loopSubdivisionTablesFactory.h index 8b03a6d1..4d97a09b 100644 --- a/opensubdiv/far/loopSubdivisionTablesFactory.h +++ b/opensubdiv/far/loopSubdivisionTablesFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_LOOP_SUBDIVISION_TABLES_FACTORY_H diff --git a/opensubdiv/far/mesh.h b/opensubdiv/far/mesh.h index 18b46f1e..db570982 100644 --- a/opensubdiv/far/mesh.h +++ b/opensubdiv/far/mesh.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_MESH_H diff --git a/opensubdiv/far/meshFactory.h b/opensubdiv/far/meshFactory.h index 9425f214..832f63e9 100644 --- a/opensubdiv/far/meshFactory.h +++ b/opensubdiv/far/meshFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_MESH_FACTORY_H diff --git a/opensubdiv/far/multiMeshFactory.h b/opensubdiv/far/multiMeshFactory.h index cfff0ec0..a07cd593 100644 --- a/opensubdiv/far/multiMeshFactory.h +++ b/opensubdiv/far/multiMeshFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_MULTI_MESH_FACTORY_H diff --git a/opensubdiv/far/patchMap.h b/opensubdiv/far/patchMap.h index 6c811a9b..7dd68005 100644 --- a/opensubdiv/far/patchMap.h +++ b/opensubdiv/far/patchMap.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_PATCH_MAP_H diff --git a/opensubdiv/far/patchParam.h b/opensubdiv/far/patchParam.h index a19aa7b7..bd15de38 100644 --- a/opensubdiv/far/patchParam.h +++ b/opensubdiv/far/patchParam.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_PATCH_PARAM_H diff --git a/opensubdiv/far/patchTables.h b/opensubdiv/far/patchTables.h index 8d6b1297..4f42eade 100644 --- a/opensubdiv/far/patchTables.h +++ b/opensubdiv/far/patchTables.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_PATCH_TABLES_H diff --git a/opensubdiv/far/patchTablesFactory.h b/opensubdiv/far/patchTablesFactory.h index e0345942..2f0bcf73 100644 --- a/opensubdiv/far/patchTablesFactory.h +++ b/opensubdiv/far/patchTablesFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_PATCH_TABLES_FACTORY_H diff --git a/opensubdiv/far/stencilTables.h b/opensubdiv/far/stencilTables.h index 445a29e1..95331e73 100644 --- a/opensubdiv/far/stencilTables.h +++ b/opensubdiv/far/stencilTables.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_STENCILTABLES_H diff --git a/opensubdiv/far/stencilTablesFactory.h b/opensubdiv/far/stencilTablesFactory.h index ef6ce3c2..e12d928e 100644 --- a/opensubdiv/far/stencilTablesFactory.h +++ b/opensubdiv/far/stencilTablesFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_STENCILTABLE_FACTORY_H diff --git a/opensubdiv/far/subdivisionTables.h b/opensubdiv/far/subdivisionTables.h index 00f0e25c..f31f4d3e 100644 --- a/opensubdiv/far/subdivisionTables.h +++ b/opensubdiv/far/subdivisionTables.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_SUBDIVISION_TABLES_H diff --git a/opensubdiv/far/subdivisionTablesFactory.h b/opensubdiv/far/subdivisionTablesFactory.h index 53a2cb6b..261f83e5 100644 --- a/opensubdiv/far/subdivisionTablesFactory.h +++ b/opensubdiv/far/subdivisionTablesFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_SUBDIVISION_TABLES_FACTORY_H diff --git a/opensubdiv/far/vertexEditTables.h b/opensubdiv/far/vertexEditTables.h index 12cdcfad..e3f7582d 100644 --- a/opensubdiv/far/vertexEditTables.h +++ b/opensubdiv/far/vertexEditTables.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_VERTEX_EDIT_TABLES_H diff --git a/opensubdiv/far/vertexEditTablesFactory.h b/opensubdiv/far/vertexEditTablesFactory.h index 996a77a1..bb509ec5 100644 --- a/opensubdiv/far/vertexEditTablesFactory.h +++ b/opensubdiv/far/vertexEditTablesFactory.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_VERTEX_EDIT_TABLES_FACTORY_H diff --git a/opensubdiv/hbr/CMakeLists.txt b/opensubdiv/hbr/CMakeLists.txt index f2ac420a..b57beada 100644 --- a/opensubdiv/hbr/CMakeLists.txt +++ b/opensubdiv/hbr/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # #------------------------------------------------------------------------------- diff --git a/opensubdiv/hbr/allocator.h b/opensubdiv/hbr/allocator.h index 1b1d2e3d..23fff4fa 100644 --- a/opensubdiv/hbr/allocator.h +++ b/opensubdiv/hbr/allocator.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRALLOCATOR_H #define HBRALLOCATOR_H diff --git a/opensubdiv/hbr/bilinear.h b/opensubdiv/hbr/bilinear.h index 3a960780..99cbf174 100644 --- a/opensubdiv/hbr/bilinear.h +++ b/opensubdiv/hbr/bilinear.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRBILINEAR_H #define HBRBILINEAR_H diff --git a/opensubdiv/hbr/catmark.h b/opensubdiv/hbr/catmark.h index bde83759..f217a358 100644 --- a/opensubdiv/hbr/catmark.h +++ b/opensubdiv/hbr/catmark.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRCATMARK_H #define HBRCATMARK_H diff --git a/opensubdiv/hbr/cornerEdit.h b/opensubdiv/hbr/cornerEdit.h index 2ef3ad6e..d781c9b7 100644 --- a/opensubdiv/hbr/cornerEdit.h +++ b/opensubdiv/hbr/cornerEdit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRCORNEREDIT_H #define HBRCORNEREDIT_H diff --git a/opensubdiv/hbr/creaseEdit.h b/opensubdiv/hbr/creaseEdit.h index 0e935b8f..82b7b1ee 100644 --- a/opensubdiv/hbr/creaseEdit.h +++ b/opensubdiv/hbr/creaseEdit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRCREASEEDIT_H #define HBRCREASEEDIT_H diff --git a/opensubdiv/hbr/face.h b/opensubdiv/hbr/face.h index c41c0d84..e58ffd4b 100644 --- a/opensubdiv/hbr/face.h +++ b/opensubdiv/hbr/face.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRFACE_H #define HBRFACE_H diff --git a/opensubdiv/hbr/faceEdit.h b/opensubdiv/hbr/faceEdit.h index 812413e3..2604ae3e 100644 --- a/opensubdiv/hbr/faceEdit.h +++ b/opensubdiv/hbr/faceEdit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRFACEEDIT_H #define HBRFACEEDIT_H diff --git a/opensubdiv/hbr/fvarData.h b/opensubdiv/hbr/fvarData.h index ebaf8c4e..bf6f4bdd 100644 --- a/opensubdiv/hbr/fvarData.h +++ b/opensubdiv/hbr/fvarData.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRFVARDATA_H #define HBRFVARDATA_H diff --git a/opensubdiv/hbr/fvarEdit.h b/opensubdiv/hbr/fvarEdit.h index 165bfb37..505f6f80 100644 --- a/opensubdiv/hbr/fvarEdit.h +++ b/opensubdiv/hbr/fvarEdit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRFVAREDIT_H #define HBRFVAREDIT_H diff --git a/opensubdiv/hbr/halfedge.h b/opensubdiv/hbr/halfedge.h index 022659fc..f384c049 100644 --- a/opensubdiv/hbr/halfedge.h +++ b/opensubdiv/hbr/halfedge.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRHALFEDGE_H #define HBRHALFEDGE_H diff --git a/opensubdiv/hbr/hierarchicalEdit.h b/opensubdiv/hbr/hierarchicalEdit.h index 44056958..21a6511f 100644 --- a/opensubdiv/hbr/hierarchicalEdit.h +++ b/opensubdiv/hbr/hierarchicalEdit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRHIERARCHICALEDIT_H #define HBRHIERARCHICALEDIT_H diff --git a/opensubdiv/hbr/holeEdit.h b/opensubdiv/hbr/holeEdit.h index 117c0de8..e21b3679 100644 --- a/opensubdiv/hbr/holeEdit.h +++ b/opensubdiv/hbr/holeEdit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRHOLEEDIT_H #define HBRHOLEEDIT_H diff --git a/opensubdiv/hbr/loop.h b/opensubdiv/hbr/loop.h index 749ea61f..ad2f332e 100644 --- a/opensubdiv/hbr/loop.h +++ b/opensubdiv/hbr/loop.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRLOOP_H #define HBRLOOP_H diff --git a/opensubdiv/hbr/mesh.h b/opensubdiv/hbr/mesh.h index 9b305f06..119642e7 100644 --- a/opensubdiv/hbr/mesh.h +++ b/opensubdiv/hbr/mesh.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRMESH_H #define HBRMESH_H diff --git a/opensubdiv/hbr/subdivision.h b/opensubdiv/hbr/subdivision.h index 1cd2d2b1..2d92ff3a 100644 --- a/opensubdiv/hbr/subdivision.h +++ b/opensubdiv/hbr/subdivision.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRSUBDIVISION_H #define HBRSUBDIVISION_H diff --git a/opensubdiv/hbr/vertex.h b/opensubdiv/hbr/vertex.h index 31a8ed55..25b2f901 100644 --- a/opensubdiv/hbr/vertex.h +++ b/opensubdiv/hbr/vertex.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRVERTEX_H #define HBRVERTEX_H diff --git a/opensubdiv/hbr/vertexEdit.h b/opensubdiv/hbr/vertexEdit.h index 903b0f32..bf614086 100644 --- a/opensubdiv/hbr/vertexEdit.h +++ b/opensubdiv/hbr/vertexEdit.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef HBRVERTEXEDIT_H #define HBRVERTEXEDIT_H diff --git a/opensubdiv/osd/Android.mk b/opensubdiv/osd/Android.mk index d391f04b..b333616e 100644 --- a/opensubdiv/osd/Android.mk +++ b/opensubdiv/osd/Android.mk @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # This file is used by the Android NDK to allow OpenSubdiv libraries diff --git a/opensubdiv/osd/CMakeLists.txt b/opensubdiv/osd/CMakeLists.txt index c3f59e3c..ad9a47f5 100644 --- a/opensubdiv/osd/CMakeLists.txt +++ b/opensubdiv/osd/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # #------------------------------------------------------------------------------- diff --git a/opensubdiv/osd/clComputeContext.cpp b/opensubdiv/osd/clComputeContext.cpp index 53070f7d..6bcb94a0 100644 --- a/opensubdiv/osd/clComputeContext.cpp +++ b/opensubdiv/osd/clComputeContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../far/mesh.h" diff --git a/opensubdiv/osd/clComputeContext.h b/opensubdiv/osd/clComputeContext.h index d851181e..9dc43037 100644 --- a/opensubdiv/osd/clComputeContext.h +++ b/opensubdiv/osd/clComputeContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CL_COMPUTE_CONTEXT_H #define OSD_CL_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/clComputeController.cpp b/opensubdiv/osd/clComputeController.cpp index e022a2e8..5e4460ac 100644 --- a/opensubdiv/osd/clComputeController.cpp +++ b/opensubdiv/osd/clComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/clComputeController.h" diff --git a/opensubdiv/osd/clComputeController.h b/opensubdiv/osd/clComputeController.h index eb588002..59128be3 100644 --- a/opensubdiv/osd/clComputeController.h +++ b/opensubdiv/osd/clComputeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CL_COMPUTE_CONTROLLER_H #define OSD_CL_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/clD3D11VertexBuffer.cpp b/opensubdiv/osd/clD3D11VertexBuffer.cpp index b7ea5be3..8e410ca5 100644 --- a/opensubdiv/osd/clD3D11VertexBuffer.cpp +++ b/opensubdiv/osd/clD3D11VertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/clD3D11VertexBuffer.h" diff --git a/opensubdiv/osd/clD3D11VertexBuffer.h b/opensubdiv/osd/clD3D11VertexBuffer.h index 8eca68a1..28c0632d 100644 --- a/opensubdiv/osd/clD3D11VertexBuffer.h +++ b/opensubdiv/osd/clD3D11VertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CL_D3D11_VERTEX_BUFFER_H #define OSD_CL_D3D11_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/clGLVertexBuffer.cpp b/opensubdiv/osd/clGLVertexBuffer.cpp index 06e0b347..6b2596ad 100644 --- a/opensubdiv/osd/clGLVertexBuffer.cpp +++ b/opensubdiv/osd/clGLVertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/clGLVertexBuffer.h" diff --git a/opensubdiv/osd/clGLVertexBuffer.h b/opensubdiv/osd/clGLVertexBuffer.h index f1763320..f40753d1 100644 --- a/opensubdiv/osd/clGLVertexBuffer.h +++ b/opensubdiv/osd/clGLVertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CL_GL_VERTEX_BUFFER_H #define OSD_CL_GL_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/clKernel.cl b/opensubdiv/osd/clKernel.cl index 04a721c5..0f8c66ec 100644 --- a/opensubdiv/osd/clKernel.cl +++ b/opensubdiv/osd/clKernel.cl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef M_PI diff --git a/opensubdiv/osd/clKernelBundle.cpp b/opensubdiv/osd/clKernelBundle.cpp index 3ce2edfa..c39a06bf 100644 --- a/opensubdiv/osd/clKernelBundle.cpp +++ b/opensubdiv/osd/clKernelBundle.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/clKernelBundle.h" diff --git a/opensubdiv/osd/clKernelBundle.h b/opensubdiv/osd/clKernelBundle.h index 431df362..2e086644 100644 --- a/opensubdiv/osd/clKernelBundle.h +++ b/opensubdiv/osd/clKernelBundle.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CL_KERNEL_BUNDLE_H #define OSD_CL_KERNEL_BUNDLE_H diff --git a/opensubdiv/osd/clVertexBuffer.cpp b/opensubdiv/osd/clVertexBuffer.cpp index a675c2a5..361d3080 100644 --- a/opensubdiv/osd/clVertexBuffer.cpp +++ b/opensubdiv/osd/clVertexBuffer.cpp @@ -1,26 +1,26 @@ // -// 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: +// Copyright 2013 Pixar // -// 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. +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is deleted and replaced with: // -// You may obtain a copy of the License at +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// http://www.apache.org/licenses/LICENSE-2.0 +// You may obtain a copy of the Apache License at // -// 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. +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/clVertexBuffer.h" diff --git a/opensubdiv/osd/clVertexBuffer.h b/opensubdiv/osd/clVertexBuffer.h index b0eef084..f7f092a9 100644 --- a/opensubdiv/osd/clVertexBuffer.h +++ b/opensubdiv/osd/clVertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CL_VERTEX_BUFFER_H #define OSD_CL_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/computeController.h b/opensubdiv/osd/computeController.h index bb61a880..4f225df0 100644 --- a/opensubdiv/osd/computeController.h +++ b/opensubdiv/osd/computeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_COMPUTE_CONTROLLER_H #define OSD_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/cpuComputeContext.cpp b/opensubdiv/osd/cpuComputeContext.cpp index 004d90c9..d336129a 100644 --- a/opensubdiv/osd/cpuComputeContext.cpp +++ b/opensubdiv/osd/cpuComputeContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../far/mesh.h" diff --git a/opensubdiv/osd/cpuComputeContext.h b/opensubdiv/osd/cpuComputeContext.h index 4b7b29a1..dd719dc4 100644 --- a/opensubdiv/osd/cpuComputeContext.h +++ b/opensubdiv/osd/cpuComputeContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_COMPUTE_CONTEXT_H #define OSD_CPU_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/cpuComputeController.cpp b/opensubdiv/osd/cpuComputeController.cpp index f2bf905d..4a3ab26d 100644 --- a/opensubdiv/osd/cpuComputeController.cpp +++ b/opensubdiv/osd/cpuComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuComputeContext.h" diff --git a/opensubdiv/osd/cpuComputeController.h b/opensubdiv/osd/cpuComputeController.h index 01eb778e..e7910bc2 100644 --- a/opensubdiv/osd/cpuComputeController.h +++ b/opensubdiv/osd/cpuComputeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_COMPUTE_CONTROLLER_H #define OSD_CPU_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/cpuD3D11VertexBuffer.cpp b/opensubdiv/osd/cpuD3D11VertexBuffer.cpp index 69002181..13c06485 100644 --- a/opensubdiv/osd/cpuD3D11VertexBuffer.cpp +++ b/opensubdiv/osd/cpuD3D11VertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuD3D11VertexBuffer.h" diff --git a/opensubdiv/osd/cpuD3D11VertexBuffer.h b/opensubdiv/osd/cpuD3D11VertexBuffer.h index 38916b91..80093af9 100644 --- a/opensubdiv/osd/cpuD3D11VertexBuffer.h +++ b/opensubdiv/osd/cpuD3D11VertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_D3D11_VERTEX_BUFFER_H #define OSD_CPU_D3D11_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/cpuEvalLimitContext.cpp b/opensubdiv/osd/cpuEvalLimitContext.cpp index 44d18710..401f4908 100644 --- a/opensubdiv/osd/cpuEvalLimitContext.cpp +++ b/opensubdiv/osd/cpuEvalLimitContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuEvalLimitContext.h" diff --git a/opensubdiv/osd/cpuEvalLimitContext.h b/opensubdiv/osd/cpuEvalLimitContext.h index ba09fe96..9506324a 100644 --- a/opensubdiv/osd/cpuEvalLimitContext.h +++ b/opensubdiv/osd/cpuEvalLimitContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_EVAL_LIMIT_CONTEXT_H #define OSD_CPU_EVAL_LIMIT_CONTEXT_H diff --git a/opensubdiv/osd/cpuEvalLimitController.cpp b/opensubdiv/osd/cpuEvalLimitController.cpp index 4911df9a..d2e7df02 100644 --- a/opensubdiv/osd/cpuEvalLimitController.cpp +++ b/opensubdiv/osd/cpuEvalLimitController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuEvalLimitController.h" diff --git a/opensubdiv/osd/cpuEvalLimitController.h b/opensubdiv/osd/cpuEvalLimitController.h index c4211b89..d08dea7a 100644 --- a/opensubdiv/osd/cpuEvalLimitController.h +++ b/opensubdiv/osd/cpuEvalLimitController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_EVAL_LIMIT_CONTROLLER_H #define OSD_CPU_EVAL_LIMIT_CONTROLLER_H diff --git a/opensubdiv/osd/cpuEvalLimitKernel.cpp b/opensubdiv/osd/cpuEvalLimitKernel.cpp index 96332145..35d299f2 100644 --- a/opensubdiv/osd/cpuEvalLimitKernel.cpp +++ b/opensubdiv/osd/cpuEvalLimitKernel.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuEvalLimitKernel.h" diff --git a/opensubdiv/osd/cpuEvalLimitKernel.h b/opensubdiv/osd/cpuEvalLimitKernel.h index a428f7b9..268d9dfa 100644 --- a/opensubdiv/osd/cpuEvalLimitKernel.h +++ b/opensubdiv/osd/cpuEvalLimitKernel.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_EVAL_LIMIT_KERNEL_H #define OSD_CPU_EVAL_LIMIT_KERNEL_H diff --git a/opensubdiv/osd/cpuEvalStencilsContext.cpp b/opensubdiv/osd/cpuEvalStencilsContext.cpp index e528626f..9d6c9cad 100644 --- a/opensubdiv/osd/cpuEvalStencilsContext.cpp +++ b/opensubdiv/osd/cpuEvalStencilsContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuEvalStencilsContext.h" diff --git a/opensubdiv/osd/cpuEvalStencilsContext.h b/opensubdiv/osd/cpuEvalStencilsContext.h index 658ee1d5..fcf4a072 100644 --- a/opensubdiv/osd/cpuEvalStencilsContext.h +++ b/opensubdiv/osd/cpuEvalStencilsContext.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_CPU_EVALSTENCILS_CONTEXT_H diff --git a/opensubdiv/osd/cpuEvalStencilsController.cpp b/opensubdiv/osd/cpuEvalStencilsController.cpp index 3ae4a35e..61466d71 100644 --- a/opensubdiv/osd/cpuEvalStencilsController.cpp +++ b/opensubdiv/osd/cpuEvalStencilsController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuEvalStencilsController.h" diff --git a/opensubdiv/osd/cpuEvalStencilsController.h b/opensubdiv/osd/cpuEvalStencilsController.h index ed662f40..57873e3c 100644 --- a/opensubdiv/osd/cpuEvalStencilsController.h +++ b/opensubdiv/osd/cpuEvalStencilsController.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_CPU_EVALSTENCILS_CONTROLLER_H diff --git a/opensubdiv/osd/cpuGLVertexBuffer.cpp b/opensubdiv/osd/cpuGLVertexBuffer.cpp index 9b7046c2..1d6cea40 100644 --- a/opensubdiv/osd/cpuGLVertexBuffer.cpp +++ b/opensubdiv/osd/cpuGLVertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuGLVertexBuffer.h" diff --git a/opensubdiv/osd/cpuGLVertexBuffer.h b/opensubdiv/osd/cpuGLVertexBuffer.h index 3f500d38..256f240e 100644 --- a/opensubdiv/osd/cpuGLVertexBuffer.h +++ b/opensubdiv/osd/cpuGLVertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_GL_VERTEX_BUFFER_H #define OSD_CPU_GL_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/cpuKernel.cpp b/opensubdiv/osd/cpuKernel.cpp index 9ed6a838..b84e04a0 100644 --- a/opensubdiv/osd/cpuKernel.cpp +++ b/opensubdiv/osd/cpuKernel.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuKernel.h" diff --git a/opensubdiv/osd/cpuKernel.h b/opensubdiv/osd/cpuKernel.h index 6dfddcd2..3b962f38 100644 --- a/opensubdiv/osd/cpuKernel.h +++ b/opensubdiv/osd/cpuKernel.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_KERNEL_H #define OSD_CPU_KERNEL_H diff --git a/opensubdiv/osd/cpuVertexBuffer.cpp b/opensubdiv/osd/cpuVertexBuffer.cpp index 19082be1..a6436d36 100644 --- a/opensubdiv/osd/cpuVertexBuffer.cpp +++ b/opensubdiv/osd/cpuVertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuVertexBuffer.h" diff --git a/opensubdiv/osd/cpuVertexBuffer.h b/opensubdiv/osd/cpuVertexBuffer.h index 5aa54920..ad98a84a 100644 --- a/opensubdiv/osd/cpuVertexBuffer.h +++ b/opensubdiv/osd/cpuVertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_VERTEX_BUFFER_H #define OSD_CPU_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/cudaComputeContext.cpp b/opensubdiv/osd/cudaComputeContext.cpp index ccbfa155..e8d5752e 100644 --- a/opensubdiv/osd/cudaComputeContext.cpp +++ b/opensubdiv/osd/cudaComputeContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../far/mesh.h" diff --git a/opensubdiv/osd/cudaComputeContext.h b/opensubdiv/osd/cudaComputeContext.h index d2530a88..ebcc907a 100644 --- a/opensubdiv/osd/cudaComputeContext.h +++ b/opensubdiv/osd/cudaComputeContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CUDA_COMPUTE_CONTEXT_H #define OSD_CUDA_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/cudaComputeController.cpp b/opensubdiv/osd/cudaComputeController.cpp index f0a1555c..59e349a0 100644 --- a/opensubdiv/osd/cudaComputeController.cpp +++ b/opensubdiv/osd/cudaComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cudaComputeContext.h" diff --git a/opensubdiv/osd/cudaComputeController.h b/opensubdiv/osd/cudaComputeController.h index 7c755d5d..4eee0ff9 100644 --- a/opensubdiv/osd/cudaComputeController.h +++ b/opensubdiv/osd/cudaComputeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CUDA_COMPUTE_CONTROLLER_H #define OSD_CUDA_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/cudaD3D11VertexBuffer.cpp b/opensubdiv/osd/cudaD3D11VertexBuffer.cpp index f607e9da..4b2fcc56 100644 --- a/opensubdiv/osd/cudaD3D11VertexBuffer.cpp +++ b/opensubdiv/osd/cudaD3D11VertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cudaD3D11VertexBuffer.h" diff --git a/opensubdiv/osd/cudaD3D11VertexBuffer.h b/opensubdiv/osd/cudaD3D11VertexBuffer.h index f6d8d69b..35f8ad43 100644 --- a/opensubdiv/osd/cudaD3D11VertexBuffer.h +++ b/opensubdiv/osd/cudaD3D11VertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CUDA_D3D11_VERTEX_BUFFER_H #define OSD_CUDA_D3D11_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/cudaGLVertexBuffer.cpp b/opensubdiv/osd/cudaGLVertexBuffer.cpp index f990fb06..c54ea8c4 100644 --- a/opensubdiv/osd/cudaGLVertexBuffer.cpp +++ b/opensubdiv/osd/cudaGLVertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cudaGLVertexBuffer.h" diff --git a/opensubdiv/osd/cudaGLVertexBuffer.h b/opensubdiv/osd/cudaGLVertexBuffer.h index 70d2e79b..120e9a4a 100644 --- a/opensubdiv/osd/cudaGLVertexBuffer.h +++ b/opensubdiv/osd/cudaGLVertexBuffer.h @@ -1,27 +1,28 @@ // -// 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: +// Copyright 2013 Pixar // -// 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. +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is deleted and replaced with: // -// You may obtain a copy of the License at +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// http://www.apache.org/licenses/LICENSE-2.0 +// You may obtain a copy of the Apache License at // -// 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. +// http://www.apache.org/licenses/LICENSE-2.0 // +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. +// + #ifndef OSD_CUDA_GL_VERTEX_BUFFER_H #define OSD_CUDA_GL_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/cudaKernel.cu b/opensubdiv/osd/cudaKernel.cu index 53275694..71547e15 100644 --- a/opensubdiv/osd/cudaKernel.cu +++ b/opensubdiv/osd/cudaKernel.cu @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include diff --git a/opensubdiv/osd/cudaVertexBuffer.cpp b/opensubdiv/osd/cudaVertexBuffer.cpp index 395431af..61657ff7 100644 --- a/opensubdiv/osd/cudaVertexBuffer.cpp +++ b/opensubdiv/osd/cudaVertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cudaVertexBuffer.h" diff --git a/opensubdiv/osd/cudaVertexBuffer.h b/opensubdiv/osd/cudaVertexBuffer.h index 85ae8fad..f55bc630 100644 --- a/opensubdiv/osd/cudaVertexBuffer.h +++ b/opensubdiv/osd/cudaVertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CUDA_VERTEX_BUFFER_H #define OSD_CUDA_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/d3d11ComputeContext.cpp b/opensubdiv/osd/d3d11ComputeContext.cpp index 8a41e712..41b62645 100644 --- a/opensubdiv/osd/d3d11ComputeContext.cpp +++ b/opensubdiv/osd/d3d11ComputeContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../far/mesh.h" diff --git a/opensubdiv/osd/d3d11ComputeContext.h b/opensubdiv/osd/d3d11ComputeContext.h index 5b26a81c..f5107ec3 100644 --- a/opensubdiv/osd/d3d11ComputeContext.h +++ b/opensubdiv/osd/d3d11ComputeContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_D3D11_COMPUTE_CONTEXT_H #define OSD_D3D11_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/d3d11ComputeController.cpp b/opensubdiv/osd/d3d11ComputeController.cpp index da1f9838..5973071d 100644 --- a/opensubdiv/osd/d3d11ComputeController.cpp +++ b/opensubdiv/osd/d3d11ComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/d3d11ComputeController.h" diff --git a/opensubdiv/osd/d3d11ComputeController.h b/opensubdiv/osd/d3d11ComputeController.h index 123e0e54..c8024626 100644 --- a/opensubdiv/osd/d3d11ComputeController.h +++ b/opensubdiv/osd/d3d11ComputeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_D3D11_COMPUTE_CONTROLLER_H #define OSD_D3D11_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/d3d11DrawContext.cpp b/opensubdiv/osd/d3d11DrawContext.cpp index a87e68a1..b522276f 100644 --- a/opensubdiv/osd/d3d11DrawContext.cpp +++ b/opensubdiv/osd/d3d11DrawContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../far/dispatcher.h" diff --git a/opensubdiv/osd/d3d11DrawContext.h b/opensubdiv/osd/d3d11DrawContext.h index 8354aa98..b255224e 100644 --- a/opensubdiv/osd/d3d11DrawContext.h +++ b/opensubdiv/osd/d3d11DrawContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_D3D11L_DRAW_CONTEXT_H #define OSD_D3D11L_DRAW_CONTEXT_H diff --git a/opensubdiv/osd/d3d11DrawRegistry.cpp b/opensubdiv/osd/d3d11DrawRegistry.cpp index 238afe31..7667eca7 100644 --- a/opensubdiv/osd/d3d11DrawRegistry.cpp +++ b/opensubdiv/osd/d3d11DrawRegistry.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/d3d11DrawRegistry.h" diff --git a/opensubdiv/osd/d3d11DrawRegistry.h b/opensubdiv/osd/d3d11DrawRegistry.h index 92c16898..22557e14 100644 --- a/opensubdiv/osd/d3d11DrawRegistry.h +++ b/opensubdiv/osd/d3d11DrawRegistry.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_D3D11_DRAW_REGISTRY_H #define OSD_D3D11_DRAW_REGISTRY_H diff --git a/opensubdiv/osd/d3d11KernelBundle.cpp b/opensubdiv/osd/d3d11KernelBundle.cpp index 1262bde5..0099ea12 100644 --- a/opensubdiv/osd/d3d11KernelBundle.cpp +++ b/opensubdiv/osd/d3d11KernelBundle.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/debug.h" diff --git a/opensubdiv/osd/d3d11KernelBundle.h b/opensubdiv/osd/d3d11KernelBundle.h index e55180c1..c77219f8 100644 --- a/opensubdiv/osd/d3d11KernelBundle.h +++ b/opensubdiv/osd/d3d11KernelBundle.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_D3D11_COMPUTE_KERNEL_BUNDLE_H #define OSD_D3D11_COMPUTE_KERNEL_BUNDLE_H diff --git a/opensubdiv/osd/d3d11Mesh.h b/opensubdiv/osd/d3d11Mesh.h index 84391e63..18c77186 100644 --- a/opensubdiv/osd/d3d11Mesh.h +++ b/opensubdiv/osd/d3d11Mesh.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_D3D11MESH_H #define OSD_D3D11MESH_H diff --git a/opensubdiv/osd/d3d11PtexTexture.cpp b/opensubdiv/osd/d3d11PtexTexture.cpp index ce6b6f01..d3423167 100644 --- a/opensubdiv/osd/d3d11PtexTexture.cpp +++ b/opensubdiv/osd/d3d11PtexTexture.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/d3d11PtexTexture.h" diff --git a/opensubdiv/osd/d3d11PtexTexture.h b/opensubdiv/osd/d3d11PtexTexture.h index 792e87a9..b83519f6 100644 --- a/opensubdiv/osd/d3d11PtexTexture.h +++ b/opensubdiv/osd/d3d11PtexTexture.h @@ -1,27 +1,28 @@ // -// 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: +// Copyright 2013 Pixar // -// 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. +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is deleted and replaced with: // -// You may obtain a copy of the License at +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// http://www.apache.org/licenses/LICENSE-2.0 +// You may obtain a copy of the Apache License at // -// 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. +// http://www.apache.org/licenses/LICENSE-2.0 // +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. +// + #ifndef OSD_D3D11_PTEX_TEXTURE_H #define OSD_D3D11_PTEX_TEXTURE_H diff --git a/opensubdiv/osd/d3d11VertexBuffer.cpp b/opensubdiv/osd/d3d11VertexBuffer.cpp index e21c2b75..a553e4ec 100644 --- a/opensubdiv/osd/d3d11VertexBuffer.cpp +++ b/opensubdiv/osd/d3d11VertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/d3d11VertexBuffer.h" diff --git a/opensubdiv/osd/d3d11VertexBuffer.h b/opensubdiv/osd/d3d11VertexBuffer.h index 403929b3..9a068f72 100644 --- a/opensubdiv/osd/d3d11VertexBuffer.h +++ b/opensubdiv/osd/d3d11VertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_D3D11_VERTEX_BUFFER_H #define OSD_D3D11_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/debug.h b/opensubdiv/osd/debug.h index 74bc41b8..fffde968 100644 --- a/opensubdiv/osd/debug.h +++ b/opensubdiv/osd/debug.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_DEBUG_H #define OSD_DEBUG_H diff --git a/opensubdiv/osd/drawContext.cpp b/opensubdiv/osd/drawContext.cpp index 876e4596..49d87740 100644 --- a/opensubdiv/osd/drawContext.cpp +++ b/opensubdiv/osd/drawContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/drawContext.h" diff --git a/opensubdiv/osd/drawContext.h b/opensubdiv/osd/drawContext.h index 3335820c..8f73f485 100644 --- a/opensubdiv/osd/drawContext.h +++ b/opensubdiv/osd/drawContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_DRAW_CONTEXT_H #define OSD_DRAW_CONTEXT_H diff --git a/opensubdiv/osd/drawRegistry.cpp b/opensubdiv/osd/drawRegistry.cpp index 29f1361c..35c49e88 100644 --- a/opensubdiv/osd/drawRegistry.cpp +++ b/opensubdiv/osd/drawRegistry.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/drawRegistry.h" diff --git a/opensubdiv/osd/drawRegistry.h b/opensubdiv/osd/drawRegistry.h index 48907ab2..f827a958 100644 --- a/opensubdiv/osd/drawRegistry.h +++ b/opensubdiv/osd/drawRegistry.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_DRAW_REGISTRY_H #define OSD_DRAW_REGISTRY_H diff --git a/opensubdiv/osd/error.cpp b/opensubdiv/osd/error.cpp index 76f95011..2fa510ae 100644 --- a/opensubdiv/osd/error.cpp +++ b/opensubdiv/osd/error.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/error.h" diff --git a/opensubdiv/osd/error.h b/opensubdiv/osd/error.h index 74aaa881..64be57e4 100644 --- a/opensubdiv/osd/error.h +++ b/opensubdiv/osd/error.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_ERROR_H #define OSD_ERROR_H diff --git a/opensubdiv/osd/evalLimitContext.cpp b/opensubdiv/osd/evalLimitContext.cpp index c19cfbbf..70364215 100644 --- a/opensubdiv/osd/evalLimitContext.cpp +++ b/opensubdiv/osd/evalLimitContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/evalLimitContext.h" diff --git a/opensubdiv/osd/evalLimitContext.h b/opensubdiv/osd/evalLimitContext.h index 23287628..9281dfff 100644 --- a/opensubdiv/osd/evalLimitContext.h +++ b/opensubdiv/osd/evalLimitContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_EVAL_LIMIT_CONTEXT_H #define OSD_EVAL_LIMIT_CONTEXT_H diff --git a/opensubdiv/osd/gcdComputeController.cpp b/opensubdiv/osd/gcdComputeController.cpp index 67f68eb6..4e5db0b2 100644 --- a/opensubdiv/osd/gcdComputeController.cpp +++ b/opensubdiv/osd/gcdComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuComputeContext.h" diff --git a/opensubdiv/osd/gcdComputeController.h b/opensubdiv/osd/gcdComputeController.h index fd32860d..cab5da34 100644 --- a/opensubdiv/osd/gcdComputeController.h +++ b/opensubdiv/osd/gcdComputeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GCD_COMPUTE_CONTROLLER_H #define OSD_GCD_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/gcdKernel.cpp b/opensubdiv/osd/gcdKernel.cpp index 1267a7e8..3bddd4df 100644 --- a/opensubdiv/osd/gcdKernel.cpp +++ b/opensubdiv/osd/gcdKernel.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/gcdKernel.h" diff --git a/opensubdiv/osd/gcdKernel.h b/opensubdiv/osd/gcdKernel.h index 150b49b6..e50ba731 100644 --- a/opensubdiv/osd/gcdKernel.h +++ b/opensubdiv/osd/gcdKernel.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GCD_KERNEL_H #define OSD_GCD_KERNEL_H diff --git a/opensubdiv/osd/glDrawContext.cpp b/opensubdiv/osd/glDrawContext.cpp index cba81aba..0868888b 100644 --- a/opensubdiv/osd/glDrawContext.cpp +++ b/opensubdiv/osd/glDrawContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../far/dispatcher.h" diff --git a/opensubdiv/osd/glDrawContext.h b/opensubdiv/osd/glDrawContext.h index a1bdcd3a..dfcdeb53 100644 --- a/opensubdiv/osd/glDrawContext.h +++ b/opensubdiv/osd/glDrawContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GL_DRAW_CONTEXT_H #define OSD_GL_DRAW_CONTEXT_H diff --git a/opensubdiv/osd/glDrawRegistry.cpp b/opensubdiv/osd/glDrawRegistry.cpp index 6a37419f..b9cadb66 100644 --- a/opensubdiv/osd/glDrawRegistry.cpp +++ b/opensubdiv/osd/glDrawRegistry.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/glDrawRegistry.h" diff --git a/opensubdiv/osd/glDrawRegistry.h b/opensubdiv/osd/glDrawRegistry.h index 5a16f362..5dbc4cd4 100644 --- a/opensubdiv/osd/glDrawRegistry.h +++ b/opensubdiv/osd/glDrawRegistry.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GL_DRAW_REGISTRY_H #define OSD_GL_DRAW_REGISTRY_H diff --git a/opensubdiv/osd/glMesh.h b/opensubdiv/osd/glMesh.h index c3001c63..e1849729 100644 --- a/opensubdiv/osd/glMesh.h +++ b/opensubdiv/osd/glMesh.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GL_MESH_H #define OSD_GL_MESH_H diff --git a/opensubdiv/osd/glPtexMipmapTexture.cpp b/opensubdiv/osd/glPtexMipmapTexture.cpp index 4592c2bb..35ee9155 100644 --- a/opensubdiv/osd/glPtexMipmapTexture.cpp +++ b/opensubdiv/osd/glPtexMipmapTexture.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/glPtexMipmapTexture.h" diff --git a/opensubdiv/osd/glPtexMipmapTexture.h b/opensubdiv/osd/glPtexMipmapTexture.h index 94f6be12..b5077298 100644 --- a/opensubdiv/osd/glPtexMipmapTexture.h +++ b/opensubdiv/osd/glPtexMipmapTexture.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GL_PTEX_MIPMAP_TEXTURE_H #define OSD_GL_PTEX_MIPMAP_TEXTURE_H diff --git a/opensubdiv/osd/glPtexTexture.cpp b/opensubdiv/osd/glPtexTexture.cpp index 5045149d..347374d3 100644 --- a/opensubdiv/osd/glPtexTexture.cpp +++ b/opensubdiv/osd/glPtexTexture.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/glPtexTexture.h" diff --git a/opensubdiv/osd/glPtexTexture.h b/opensubdiv/osd/glPtexTexture.h index f4754cd0..8fd50314 100644 --- a/opensubdiv/osd/glPtexTexture.h +++ b/opensubdiv/osd/glPtexTexture.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GL_PTEX_TEXTURE_H #define OSD_GL_PTEX_TEXTURE_H diff --git a/opensubdiv/osd/glVertexBuffer.cpp b/opensubdiv/osd/glVertexBuffer.cpp index ff884b6d..d9627e04 100644 --- a/opensubdiv/osd/glVertexBuffer.cpp +++ b/opensubdiv/osd/glVertexBuffer.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/glVertexBuffer.h" diff --git a/opensubdiv/osd/glVertexBuffer.h b/opensubdiv/osd/glVertexBuffer.h index b451c2f3..e814ad30 100644 --- a/opensubdiv/osd/glVertexBuffer.h +++ b/opensubdiv/osd/glVertexBuffer.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GL_VERTEX_BUFFER_H #define OSD_GL_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/glslComputeContext.cpp b/opensubdiv/osd/glslComputeContext.cpp index 6a59c18b..97457a8a 100644 --- a/opensubdiv/osd/glslComputeContext.cpp +++ b/opensubdiv/osd/glslComputeContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../far/mesh.h" diff --git a/opensubdiv/osd/glslComputeContext.h b/opensubdiv/osd/glslComputeContext.h index 115e5972..73194201 100644 --- a/opensubdiv/osd/glslComputeContext.h +++ b/opensubdiv/osd/glslComputeContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GLSL_COMPUTE_CONTEXT_H #define OSD_GLSL_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/glslComputeController.cpp b/opensubdiv/osd/glslComputeController.cpp index 2832780a..cd86ffba 100644 --- a/opensubdiv/osd/glslComputeController.cpp +++ b/opensubdiv/osd/glslComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/glslComputeController.h" diff --git a/opensubdiv/osd/glslComputeController.h b/opensubdiv/osd/glslComputeController.h index 9fc5d8c4..cebf691c 100644 --- a/opensubdiv/osd/glslComputeController.h +++ b/opensubdiv/osd/glslComputeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GLSL_COMPUTE_CONTROLLER_H #define OSD_GLSL_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/glslComputeKernel.glsl b/opensubdiv/osd/glslComputeKernel.glsl index 94b41ea3..08c8316b 100644 --- a/opensubdiv/osd/glslComputeKernel.glsl +++ b/opensubdiv/osd/glslComputeKernel.glsl @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #version 430 subroutine void computeKernelType(); diff --git a/opensubdiv/osd/glslKernelBundle.cpp b/opensubdiv/osd/glslKernelBundle.cpp index 6758a7b2..62e236d7 100644 --- a/opensubdiv/osd/glslKernelBundle.cpp +++ b/opensubdiv/osd/glslKernelBundle.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include diff --git a/opensubdiv/osd/glslKernelBundle.h b/opensubdiv/osd/glslKernelBundle.h index f2c51053..4e5102f5 100644 --- a/opensubdiv/osd/glslKernelBundle.h +++ b/opensubdiv/osd/glslKernelBundle.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GLSL_COMPUTE_KERNEL_BUNDLE_H #define OSD_GLSL_COMPUTE_KERNEL_BUNDLE_H diff --git a/opensubdiv/osd/glslPatchBSpline.glsl b/opensubdiv/osd/glslPatchBSpline.glsl index 1a5efb8b..30e973ed 100644 --- a/opensubdiv/osd/glslPatchBSpline.glsl +++ b/opensubdiv/osd/glslPatchBSpline.glsl @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + //---------------------------------------------------------- // Patches.TessVertexBSpline //---------------------------------------------------------- diff --git a/opensubdiv/osd/glslPatchCommon.glsl b/opensubdiv/osd/glslPatchCommon.glsl index 06386545..0202fa00 100644 --- a/opensubdiv/osd/glslPatchCommon.glsl +++ b/opensubdiv/osd/glslPatchCommon.glsl @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + //---------------------------------------------------------- // Patches.Common //---------------------------------------------------------- diff --git a/opensubdiv/osd/glslPatchGregory.glsl b/opensubdiv/osd/glslPatchGregory.glsl index 954effd0..516590fc 100644 --- a/opensubdiv/osd/glslPatchGregory.glsl +++ b/opensubdiv/osd/glslPatchGregory.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // //---------------------------------------------------------- diff --git a/opensubdiv/osd/glslPatchTransition.glsl b/opensubdiv/osd/glslPatchTransition.glsl index a45746f5..ec39f2d4 100644 --- a/opensubdiv/osd/glslPatchTransition.glsl +++ b/opensubdiv/osd/glslPatchTransition.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(OSD_TRANSITION_PATTERN00) || defined(OSD_TRANSITION_PATTERN01) || defined(OSD_TRANSITION_PATTERN02) || defined(OSD_TRANSITION_PATTERN10) || defined(OSD_TRANSITION_PATTERN11) || defined(OSD_TRANSITION_PATTERN12) || defined(OSD_TRANSITION_PATTERN13) || defined(OSD_TRANSITION_PATTERN21) || defined(OSD_TRANSITION_PATTERN22) || defined(OSD_TRANSITION_PATTERN23) diff --git a/opensubdiv/osd/glslTransformFeedbackComputeContext.cpp b/opensubdiv/osd/glslTransformFeedbackComputeContext.cpp index 765ca35c..d4e64e88 100644 --- a/opensubdiv/osd/glslTransformFeedbackComputeContext.cpp +++ b/opensubdiv/osd/glslTransformFeedbackComputeContext.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../version.h" diff --git a/opensubdiv/osd/glslTransformFeedbackComputeContext.h b/opensubdiv/osd/glslTransformFeedbackComputeContext.h index 46d5d584..b87ba5fc 100644 --- a/opensubdiv/osd/glslTransformFeedbackComputeContext.h +++ b/opensubdiv/osd/glslTransformFeedbackComputeContext.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GLSL_TRANSFORM_FEEDBACK_COMPUTE_CONTEXT_H #define OSD_GLSL_TRANSFORM_FEEDBACK_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/glslTransformFeedbackComputeController.cpp b/opensubdiv/osd/glslTransformFeedbackComputeController.cpp index 768d7269..5789c8ab 100644 --- a/opensubdiv/osd/glslTransformFeedbackComputeController.cpp +++ b/opensubdiv/osd/glslTransformFeedbackComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/glslTransformFeedbackComputeController.h" diff --git a/opensubdiv/osd/glslTransformFeedbackComputeController.h b/opensubdiv/osd/glslTransformFeedbackComputeController.h index 77b16820..ec00f362 100644 --- a/opensubdiv/osd/glslTransformFeedbackComputeController.h +++ b/opensubdiv/osd/glslTransformFeedbackComputeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GLSL_TRANSFORM_FEEDBACK_COMPUTE_CONTROLLER_H #define OSD_GLSL_TRANSFORM_FEEDBACK_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/glslTransformFeedbackKernel.glsl b/opensubdiv/osd/glslTransformFeedbackKernel.glsl index c565e5c6..f81c7e3e 100644 --- a/opensubdiv/osd/glslTransformFeedbackKernel.glsl +++ b/opensubdiv/osd/glslTransformFeedbackKernel.glsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #version 420 diff --git a/opensubdiv/osd/glslTransformFeedbackKernelBundle.cpp b/opensubdiv/osd/glslTransformFeedbackKernelBundle.cpp index 9b683d08..d51e47ab 100644 --- a/opensubdiv/osd/glslTransformFeedbackKernelBundle.cpp +++ b/opensubdiv/osd/glslTransformFeedbackKernelBundle.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../version.h" diff --git a/opensubdiv/osd/glslTransformFeedbackKernelBundle.h b/opensubdiv/osd/glslTransformFeedbackKernelBundle.h index a3434ce8..19d43710 100644 --- a/opensubdiv/osd/glslTransformFeedbackKernelBundle.h +++ b/opensubdiv/osd/glslTransformFeedbackKernelBundle.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_GLSL_TRANSFORM_FEEDBACK_KERNEL_BUNDLE_H #define OSD_GLSL_TRANSFORM_FEEDBACK_KERNEL_BUNDLE_H diff --git a/opensubdiv/osd/hlslComputeKernel.hlsl b/opensubdiv/osd/hlslComputeKernel.hlsl index e88732cb..ab1c38ea 100644 --- a/opensubdiv/osd/hlslComputeKernel.hlsl +++ b/opensubdiv/osd/hlslComputeKernel.hlsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // interface IComputeKernel { diff --git a/opensubdiv/osd/hlslPatchBSpline.hlsl b/opensubdiv/osd/hlslPatchBSpline.hlsl index 20f2f2f2..43df9526 100644 --- a/opensubdiv/osd/hlslPatchBSpline.hlsl +++ b/opensubdiv/osd/hlslPatchBSpline.hlsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifdef OSD_TRANSITION_TRIANGLE_SUBPATCH diff --git a/opensubdiv/osd/hlslPatchCommon.hlsl b/opensubdiv/osd/hlslPatchCommon.hlsl index 73396120..3add14f7 100644 --- a/opensubdiv/osd/hlslPatchCommon.hlsl +++ b/opensubdiv/osd/hlslPatchCommon.hlsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // //---------------------------------------------------------- diff --git a/opensubdiv/osd/hlslPatchGregory.hlsl b/opensubdiv/osd/hlslPatchGregory.hlsl index 84bc390e..893d27fe 100644 --- a/opensubdiv/osd/hlslPatchGregory.hlsl +++ b/opensubdiv/osd/hlslPatchGregory.hlsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // //---------------------------------------------------------- diff --git a/opensubdiv/osd/hlslPatchTransition.hlsl b/opensubdiv/osd/hlslPatchTransition.hlsl index 2e41cdfa..ce283e9b 100644 --- a/opensubdiv/osd/hlslPatchTransition.hlsl +++ b/opensubdiv/osd/hlslPatchTransition.hlsl @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(OSD_TRANSITION_PATTERN00) || defined(OSD_TRANSITION_PATTERN01) || defined(OSD_TRANSITION_PATTERN02) || defined(OSD_TRANSITION_PATTERN10) || defined(OSD_TRANSITION_PATTERN11) || defined(OSD_TRANSITION_PATTERN12) || defined(OSD_TRANSITION_PATTERN13) || defined(OSD_TRANSITION_PATTERN21) || defined(OSD_TRANSITION_PATTERN22) || defined(OSD_TRANSITION_PATTERN23) diff --git a/opensubdiv/osd/mesh.h b/opensubdiv/osd/mesh.h index ca141911..c4701fd6 100644 --- a/opensubdiv/osd/mesh.h +++ b/opensubdiv/osd/mesh.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_MESH_H #define OSD_MESH_H diff --git a/opensubdiv/osd/nonCopyable.h b/opensubdiv/osd/nonCopyable.h index 596d7ea1..dd4298c4 100644 --- a/opensubdiv/osd/nonCopyable.h +++ b/opensubdiv/osd/nonCopyable.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_NON_COPYABLE_H #define OSD_NON_COPYABLE_H diff --git a/opensubdiv/osd/ompComputeController.cpp b/opensubdiv/osd/ompComputeController.cpp index 53552326..f40c2579 100644 --- a/opensubdiv/osd/ompComputeController.cpp +++ b/opensubdiv/osd/ompComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuComputeContext.h" diff --git a/opensubdiv/osd/ompComputeController.h b/opensubdiv/osd/ompComputeController.h index 076dc871..16bcc529 100644 --- a/opensubdiv/osd/ompComputeController.h +++ b/opensubdiv/osd/ompComputeController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_OMP_COMPUTE_CONTROLLER_H #define OSD_OMP_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/ompEvalStencilsController.cpp b/opensubdiv/osd/ompEvalStencilsController.cpp index e9e0748e..da690779 100644 --- a/opensubdiv/osd/ompEvalStencilsController.cpp +++ b/opensubdiv/osd/ompEvalStencilsController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/ompEvalStencilsController.h" diff --git a/opensubdiv/osd/ompEvalStencilsController.h b/opensubdiv/osd/ompEvalStencilsController.h index 642cb868..664b6322 100644 --- a/opensubdiv/osd/ompEvalStencilsController.h +++ b/opensubdiv/osd/ompEvalStencilsController.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_OMP_EVALSTENCILS_CONTROLLER_H diff --git a/opensubdiv/osd/ompKernel.cpp b/opensubdiv/osd/ompKernel.cpp index 8d718662..2e61005c 100644 --- a/opensubdiv/osd/ompKernel.cpp +++ b/opensubdiv/osd/ompKernel.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/ompKernel.h" diff --git a/opensubdiv/osd/ompKernel.h b/opensubdiv/osd/ompKernel.h index 0c54d89b..4118712f 100644 --- a/opensubdiv/osd/ompKernel.h +++ b/opensubdiv/osd/ompKernel.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_OMP_KERNEL_H #define OSD_OMP_KERNEL_H diff --git a/opensubdiv/osd/opengl.h b/opensubdiv/osd/opengl.h index b9d88fde..96546b16 100644 --- a/opensubdiv/osd/opengl.h +++ b/opensubdiv/osd/opengl.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_OPENGL_H #define OSD_OPENGL_H diff --git a/opensubdiv/osd/ptexMipmapTextureLoader.cpp b/opensubdiv/osd/ptexMipmapTextureLoader.cpp index 755566e9..e4d7e670 100644 --- a/opensubdiv/osd/ptexMipmapTextureLoader.cpp +++ b/opensubdiv/osd/ptexMipmapTextureLoader.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/ptexMipmapTextureLoader.h" diff --git a/opensubdiv/osd/ptexMipmapTextureLoader.h b/opensubdiv/osd/ptexMipmapTextureLoader.h index bad83f54..243b569a 100644 --- a/opensubdiv/osd/ptexMipmapTextureLoader.h +++ b/opensubdiv/osd/ptexMipmapTextureLoader.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_PTEX_MIPMAP_TEXTURE_LOADER_H #define OSD_PTEX_MIPMAP_TEXTURE_LOADER_H diff --git a/opensubdiv/osd/ptexTextureLoader.cpp b/opensubdiv/osd/ptexTextureLoader.cpp index cda75363..7bcf8d1e 100644 --- a/opensubdiv/osd/ptexTextureLoader.cpp +++ b/opensubdiv/osd/ptexTextureLoader.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/error.h" diff --git a/opensubdiv/osd/ptexTextureLoader.h b/opensubdiv/osd/ptexTextureLoader.h index 1e9dd3bc..a9d12926 100644 --- a/opensubdiv/osd/ptexTextureLoader.h +++ b/opensubdiv/osd/ptexTextureLoader.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_PTEX_TEXTURE_LOADER_H #define OSD_PTEX_TEXTURE_LOADER_H diff --git a/opensubdiv/osd/tbbComputeController.cpp b/opensubdiv/osd/tbbComputeController.cpp index d02e84c0..e73f946d 100644 --- a/opensubdiv/osd/tbbComputeController.cpp +++ b/opensubdiv/osd/tbbComputeController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuComputeContext.h" diff --git a/opensubdiv/osd/tbbComputeController.h b/opensubdiv/osd/tbbComputeController.h index f10a370f..6994c861 100644 --- a/opensubdiv/osd/tbbComputeController.h +++ b/opensubdiv/osd/tbbComputeController.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef OSD_TBB_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/tbbEvalStencilsController.cpp b/opensubdiv/osd/tbbEvalStencilsController.cpp index 542a2a64..1be60a89 100644 --- a/opensubdiv/osd/tbbEvalStencilsController.cpp +++ b/opensubdiv/osd/tbbEvalStencilsController.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/tbbEvalStencilsController.h" diff --git a/opensubdiv/osd/tbbEvalStencilsController.h b/opensubdiv/osd/tbbEvalStencilsController.h index 88daf5de..3c96859f 100644 --- a/opensubdiv/osd/tbbEvalStencilsController.h +++ b/opensubdiv/osd/tbbEvalStencilsController.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef FAR_TBB_EVALSTENCILS_CONTROLLER_H diff --git a/opensubdiv/osd/tbbKernel.cpp b/opensubdiv/osd/tbbKernel.cpp index 31957e2c..eb5916d7 100644 --- a/opensubdiv/osd/tbbKernel.cpp +++ b/opensubdiv/osd/tbbKernel.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "../osd/cpuKernel.h" diff --git a/opensubdiv/osd/tbbKernel.h b/opensubdiv/osd/tbbKernel.h index f69591c7..698dffd8 100644 --- a/opensubdiv/osd/tbbKernel.h +++ b/opensubdiv/osd/tbbKernel.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef OSD_TBB_KERNEL_H diff --git a/opensubdiv/osd/vertex.h b/opensubdiv/osd/vertex.h index b349c648..bb6eee96 100644 --- a/opensubdiv/osd/vertex.h +++ b/opensubdiv/osd/vertex.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_VERTEX_H #define OSD_VERTEX_H diff --git a/opensubdiv/osd/vertexDescriptor.h b/opensubdiv/osd/vertexDescriptor.h index b6ea59f7..75443dcb 100644 --- a/opensubdiv/osd/vertexDescriptor.h +++ b/opensubdiv/osd/vertexDescriptor.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSD_CPU_VERTEX_DESCRIPTOR_H #define OSD_CPU_VERTEX_DESCRIPTOR_H diff --git a/opensubdiv/osdutil/CMakeLists.txt b/opensubdiv/osdutil/CMakeLists.txt index 773a49ae..86bbf61e 100644 --- a/opensubdiv/osdutil/CMakeLists.txt +++ b/opensubdiv/osdutil/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # #------------------------------------------------------------------------------- diff --git a/opensubdiv/osdutil/batch.h b/opensubdiv/osdutil/batch.h index b59c7ce6..1a2fcac5 100644 --- a/opensubdiv/osdutil/batch.h +++ b/opensubdiv/osdutil/batch.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSDUTIL_MESH_BATCH_H #define OSDUTIL_MESH_BATCH_H diff --git a/opensubdiv/osdutil/batchCL.h b/opensubdiv/osdutil/batchCL.h index 0b6ed169..181276e6 100644 --- a/opensubdiv/osdutil/batchCL.h +++ b/opensubdiv/osdutil/batchCL.h @@ -1,27 +1,28 @@ // -// 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: +// Copyright 2013 Pixar // -// 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. +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is deleted and replaced with: // -// You may obtain a copy of the License at +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// http://www.apache.org/licenses/LICENSE-2.0 +// You may obtain a copy of the Apache License at // -// 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. +// http://www.apache.org/licenses/LICENSE-2.0 // +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. +// + #ifndef OSDUTIL_MESH_BATCH_CL_H #define OSDUTIL_MESH_BATCH_CL_H diff --git a/opensubdiv/osdutil/drawController.h b/opensubdiv/osdutil/drawController.h index 036a94f8..343925e9 100644 --- a/opensubdiv/osdutil/drawController.h +++ b/opensubdiv/osdutil/drawController.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSDUTIL_DRAW_CONTROLLER_H #define OSDUTIL_DRAW_CONTROLLER_H diff --git a/opensubdiv/osdutil/drawItem.h b/opensubdiv/osdutil/drawItem.h index 1be4bc42..f02c333d 100644 --- a/opensubdiv/osdutil/drawItem.h +++ b/opensubdiv/osdutil/drawItem.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef OSDUTIL_DRAW_ITEM_H #define OSDUTIL_DRAW_ITEM_H diff --git a/opensubdiv/tools/stringify/CMakeLists.txt b/opensubdiv/tools/stringify/CMakeLists.txt index fab67060..653c04c2 100644 --- a/opensubdiv/tools/stringify/CMakeLists.txt +++ b/opensubdiv/tools/stringify/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # _add_executable(stringify diff --git a/opensubdiv/tools/stringify/main.cpp b/opensubdiv/tools/stringify/main.cpp index 8bf79427..9db0614f 100644 --- a/opensubdiv/tools/stringify/main.cpp +++ b/opensubdiv/tools/stringify/main.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include diff --git a/opensubdiv/version.h b/opensubdiv/version.h index d3f88480..980c1f02 100644 --- a/opensubdiv/version.h +++ b/opensubdiv/version.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #ifndef OPENSUBDIV_VERSION_H diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index e20ce4c4..0e198284 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # if(PYTHONINTERP_FOUND AND SWIG_FOUND) diff --git a/python/doc/Makefile b/python/doc/Makefile index fdca922b..b624c152 100644 --- a/python/doc/Makefile +++ b/python/doc/Makefile @@ -1,3 +1,27 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. +# +# You may obtain a copy of the Apache License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. +# + # Makefile for Sphinx documentation # diff --git a/python/doc/conf.py b/python/doc/conf.py index 44104519..00ab870b 100644 --- a/python/doc/conf.py +++ b/python/doc/conf.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # OpenSubdiv documentation build configuration file, created by diff --git a/python/doc/index.rst b/python/doc/index.rst index 8d8ec1fe..9b48bee1 100644 --- a/python/doc/index.rst +++ b/python/doc/index.rst @@ -3,6 +3,30 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. +.. + Copyright 2013 Pixar + + Licensed under the Apache License, Version 2.0 (the "Apache License") + with the following modification; you may not use this file except in + compliance with the Apache License and the following modification to it: + Section 6. Trademarks. is 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 to comply with Section 4(c) of + the License and to reproduce the content of the NOTICE file. + + You may obtain a copy of the Apache License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the Apache License with the above modification is + distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the Apache License for the specific + language governing permissions and limitations under the Apache License. + + Overview and Design Philosophy ======= diff --git a/python/osd/__init__.py b/python/osd/__init__.py index 674230ff..f379e458 100644 --- a/python/osd/__init__.py +++ b/python/osd/__init__.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from common import * diff --git a/python/osd/adapters.py b/python/osd/adapters.py index 8c00485d..57d28947 100644 --- a/python/osd/adapters.py +++ b/python/osd/adapters.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # # Helper classes that present mesh data as a Pythonic list-like diff --git a/python/osd/buffer.h b/python/osd/buffer.h index 7c8891f9..291d4929 100644 --- a/python/osd/buffer.h +++ b/python/osd/buffer.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #pragma once diff --git a/python/osd/common.py b/python/osd/common.py index 73633b94..e73d0886 100644 --- a/python/osd/common.py +++ b/python/osd/common.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # class TopoError(Exception): diff --git a/python/osd/internal.h b/python/osd/internal.h index befaeaa5..d4d079bf 100644 --- a/python/osd/internal.h +++ b/python/osd/internal.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include diff --git a/python/osd/osdshim.i b/python/osd/osdshim.i index 7f9e8f7b..c738145f 100644 --- a/python/osd/osdshim.i +++ b/python/osd/osdshim.i @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // %module shim diff --git a/python/osd/subdivider.cpp b/python/osd/subdivider.cpp index 1a91f263..d7ba4e8a 100644 --- a/python/osd/subdivider.cpp +++ b/python/osd/subdivider.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "internal.h" diff --git a/python/osd/subdivider.h b/python/osd/subdivider.h index ab0f50ca..6842a19b 100644 --- a/python/osd/subdivider.h +++ b/python/osd/subdivider.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #pragma once diff --git a/python/osd/subdivider.py b/python/osd/subdivider.py index 6b3c1c7e..fa6de8b0 100644 --- a/python/osd/subdivider.py +++ b/python/osd/subdivider.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from osd import * diff --git a/python/osd/topology.cpp b/python/osd/topology.cpp index 3f329aa8..00e7b68b 100644 --- a/python/osd/topology.cpp +++ b/python/osd/topology.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include "internal.h" diff --git a/python/osd/topology.h b/python/osd/topology.h index fddf95ac..aa6e4f93 100644 --- a/python/osd/topology.h +++ b/python/osd/topology.h @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #pragma once diff --git a/python/osd/topology.py b/python/osd/topology.py index e03e43d0..5aade9d7 100644 --- a/python/osd/topology.py +++ b/python/osd/topology.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from common import * diff --git a/python/setup.py b/python/setup.py index fdefc52c..e804abce 100755 --- a/python/setup.py +++ b/python/setup.py @@ -1,27 +1,26 @@ #!/usr/bin/env python # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from distutils.core import setup, Command, Extension diff --git a/python/test/__init__.py b/python/test/__init__.py index 5f0ec180..9fddc331 100644 --- a/python/test/__init__.py +++ b/python/test/__init__.py @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # from simple import * diff --git a/python/test/simple.py b/python/test/simple.py index 2f01fbf7..c98dd849 100755 --- a/python/test/simple.py +++ b/python/test/simple.py @@ -1,27 +1,26 @@ #!/usr/bin/env python # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # import numpy as np diff --git a/regression/CMakeLists.txt b/regression/CMakeLists.txt index ad306e02..63fb1eee 100644 --- a/regression/CMakeLists.txt +++ b/regression/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # add_subdirectory(hbr_regression) diff --git a/regression/common/shape_utils.h b/regression/common/shape_utils.h index 36effed6..00834ce3 100644 --- a/regression/common/shape_utils.h +++ b/regression/common/shape_utils.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #ifndef SHAPE_UTILS_H #define SHAPE_UTILS_H diff --git a/regression/far_regression/CMakeLists.txt b/regression/far_regression/CMakeLists.txt index a538eae4..c6ec5b7b 100644 --- a/regression/far_regression/CMakeLists.txt +++ b/regression/far_regression/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # include_directories( diff --git a/regression/far_regression/example_createMesh.py b/regression/far_regression/example_createMesh.py index 2a52e8ae..86bfcb37 100644 --- a/regression/far_regression/example_createMesh.py +++ b/regression/far_regression/example_createMesh.py @@ -1,27 +1,26 @@ #!/usr/bin/env python # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # """ diff --git a/regression/far_regression/main.cpp b/regression/far_regression/main.cpp index 39c29dce..05ff8a6e 100644 --- a/regression/far_regression/main.cpp +++ b/regression/far_regression/main.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include diff --git a/regression/hbr_regression/CMakeLists.txt b/regression/hbr_regression/CMakeLists.txt index deeabb9f..862f08a3 100644 --- a/regression/hbr_regression/CMakeLists.txt +++ b/regression/hbr_regression/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # include_directories( diff --git a/regression/hbr_regression/baseline.cpp b/regression/hbr_regression/baseline.cpp index cbfc96bf..b14c1c06 100644 --- a/regression/hbr_regression/baseline.cpp +++ b/regression/hbr_regression/baseline.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include diff --git a/regression/hbr_regression/init_shapes.h b/regression/hbr_regression/init_shapes.h index a2469866..53af48a6 100644 --- a/regression/hbr_regression/init_shapes.h +++ b/regression/hbr_regression/init_shapes.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + #include "../common/shape_utils.h" struct shaperec { diff --git a/regression/hbr_regression/main.cpp b/regression/hbr_regression/main.cpp index 1014912c..22cdd92b 100644 --- a/regression/hbr_regression/main.cpp +++ b/regression/hbr_regression/main.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #include diff --git a/regression/osd_regression/CMakeLists.txt b/regression/osd_regression/CMakeLists.txt index 63607559..48c86079 100644 --- a/regression/osd_regression/CMakeLists.txt +++ b/regression/osd_regression/CMakeLists.txt @@ -1,26 +1,25 @@ # -# Copyright 2013 Pixar +# 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: +# Licensed under the Apache License, Version 2.0 (the "Apache License") +# with the following modification; you may not use this file except in +# compliance with the Apache License and the following modification to it: +# Section 6. Trademarks. is 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. +# 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 to comply with Section 4(c) of +# the License and to reproduce the content of the NOTICE file. # -# You may obtain a copy of the License at +# You may obtain a copy of the Apache License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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. +# Unless required by applicable law or agreed to in writing, software +# distributed under the Apache License with the above modification is +# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the Apache License for the specific +# language governing permissions and limitations under the Apache License. # include_directories( diff --git a/regression/osd_regression/main.cpp b/regression/osd_regression/main.cpp index da6cb85d..8d5f3bec 100644 --- a/regression/osd_regression/main.cpp +++ b/regression/osd_regression/main.cpp @@ -1,26 +1,25 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // #if defined(__APPLE__) diff --git a/regression/shapes/bilinear_cube.h b/regression/shapes/bilinear_cube.h index 6bd91d14..807047a8 100644 --- a/regression/shapes/bilinear_cube.h +++ b/regression/shapes/bilinear_cube.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string bilinear_cube = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_bishop.h b/regression/shapes/catmark_bishop.h index 7e6b0859..f1304c3d 100644 --- a/regression/shapes/catmark_bishop.h +++ b/regression/shapes/catmark_bishop.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_bishop = std::string( "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_car.h b/regression/shapes/catmark_car.h index 997d49e8..0d7922e9 100644 --- a/regression/shapes/catmark_car.h +++ b/regression/shapes/catmark_car.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_car = std::string( "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_cube.h b/regression/shapes/catmark_cube.h index b1586825..e388ad62 100644 --- a/regression/shapes/catmark_cube.h +++ b/regression/shapes/catmark_cube.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_cube = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_cube_corner0.h b/regression/shapes/catmark_cube_corner0.h index 58a0f6d5..5086513b 100644 --- a/regression/shapes/catmark_cube_corner0.h +++ b/regression/shapes/catmark_cube_corner0.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_cube_corner0 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_cube_corner1.h b/regression/shapes/catmark_cube_corner1.h index 2f729593..25a9f48f 100644 --- a/regression/shapes/catmark_cube_corner1.h +++ b/regression/shapes/catmark_cube_corner1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_cube_corner1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_cube_corner2.h b/regression/shapes/catmark_cube_corner2.h index a03e3987..3708d229 100644 --- a/regression/shapes/catmark_cube_corner2.h +++ b/regression/shapes/catmark_cube_corner2.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_cube_corner2 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_cube_corner3.h b/regression/shapes/catmark_cube_corner3.h index 75f78b19..edbbc660 100644 --- a/regression/shapes/catmark_cube_corner3.h +++ b/regression/shapes/catmark_cube_corner3.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_cube_corner3 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_cube_corner4.h b/regression/shapes/catmark_cube_corner4.h index f5418185..bfffe2e6 100644 --- a/regression/shapes/catmark_cube_corner4.h +++ b/regression/shapes/catmark_cube_corner4.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_cube_corner4 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_cube_creases0.h b/regression/shapes/catmark_cube_creases0.h index 42025b34..255727e7 100644 --- a/regression/shapes/catmark_cube_creases0.h +++ b/regression/shapes/catmark_cube_creases0.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_cube_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_cube_creases1.h b/regression/shapes/catmark_cube_creases1.h index 06a64ce0..d045d9da 100644 --- a/regression/shapes/catmark_cube_creases1.h +++ b/regression/shapes/catmark_cube_creases1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_cube_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_dart_edgecorner.h b/regression/shapes/catmark_dart_edgecorner.h index 589b68c3..8daf1608 100644 --- a/regression/shapes/catmark_dart_edgecorner.h +++ b/regression/shapes/catmark_dart_edgecorner.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_dart_edgecorner = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_dart_edgeonly.h b/regression/shapes/catmark_dart_edgeonly.h index 9ff3477d..479d7650 100644 --- a/regression/shapes/catmark_dart_edgeonly.h +++ b/regression/shapes/catmark_dart_edgeonly.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_dart_edgeonly = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_edgecorner.h b/regression/shapes/catmark_edgecorner.h index 2df9c289..184ce548 100644 --- a/regression/shapes/catmark_edgecorner.h +++ b/regression/shapes/catmark_edgecorner.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_edgecorner = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_edgeonly.h b/regression/shapes/catmark_edgeonly.h index 61f6e419..c1ba6e84 100644 --- a/regression/shapes/catmark_edgeonly.h +++ b/regression/shapes/catmark_edgeonly.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_edgeonly = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_flap.h b/regression/shapes/catmark_flap.h index 82d3feb4..9a6b0644 100644 --- a/regression/shapes/catmark_flap.h +++ b/regression/shapes/catmark_flap.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_flap = "# This file uses centimeters as units for non-parametric coordinates.\n" "v -0.110026 1.92157 -1.57017 \n" diff --git a/regression/shapes/catmark_flap2.h b/regression/shapes/catmark_flap2.h index f3238bc5..bcb3f05a 100644 --- a/regression/shapes/catmark_flap2.h +++ b/regression/shapes/catmark_flap2.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_flap2 = "# This file uses centimeters as units for non-parametric coordinates.\n" "v -0.500000 -0.125000 0.000000 \n" diff --git a/regression/shapes/catmark_gregory_test1.h b/regression/shapes/catmark_gregory_test1.h index 7c6cd10e..02fa9878 100644 --- a/regression/shapes/catmark_gregory_test1.h +++ b/regression/shapes/catmark_gregory_test1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_gregory_test1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_gregory_test2.h b/regression/shapes/catmark_gregory_test2.h index 46e465f7..b4cb2da1 100644 --- a/regression/shapes/catmark_gregory_test2.h +++ b/regression/shapes/catmark_gregory_test2.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_gregory_test2 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_gregory_test3.h b/regression/shapes/catmark_gregory_test3.h index ba397ca5..4b490333 100644 --- a/regression/shapes/catmark_gregory_test3.h +++ b/regression/shapes/catmark_gregory_test3.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_gregory_test3 = "v 1.000000 1.000000 -0.000000\n" "v 1.000000 0.000000 0.000000\n" diff --git a/regression/shapes/catmark_gregory_test4.h b/regression/shapes/catmark_gregory_test4.h index 6e3cb9a5..7695c646 100644 --- a/regression/shapes/catmark_gregory_test4.h +++ b/regression/shapes/catmark_gregory_test4.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_gregory_test4 = "# This file uses centimeters as units for non-parametric coordinates.\n" "v -0.500000 -0.500000 0.500000\n" diff --git a/regression/shapes/catmark_helmet.h b/regression/shapes/catmark_helmet.h index 1ed7210f..034797e2 100644 --- a/regression/shapes/catmark_helmet.h +++ b/regression/shapes/catmark_helmet.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_helmet = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_hole_test1.h b/regression/shapes/catmark_hole_test1.h index da48c441..29368fc0 100644 --- a/regression/shapes/catmark_hole_test1.h +++ b/regression/shapes/catmark_hole_test1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_hole_test1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_hole_test2.h b/regression/shapes/catmark_hole_test2.h index 916899fc..d16107d3 100644 --- a/regression/shapes/catmark_hole_test2.h +++ b/regression/shapes/catmark_hole_test2.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_hole_test2 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_pawn.h b/regression/shapes/catmark_pawn.h index 357c7fcd..b2c6027f 100644 --- a/regression/shapes/catmark_pawn.h +++ b/regression/shapes/catmark_pawn.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_pawn = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_pyramid.h b/regression/shapes/catmark_pyramid.h index be9dfaed..c1bc276d 100644 --- a/regression/shapes/catmark_pyramid.h +++ b/regression/shapes/catmark_pyramid.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_pyramid = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_pyramid_creases0.h b/regression/shapes/catmark_pyramid_creases0.h index 2fecd804..79c485ff 100644 --- a/regression/shapes/catmark_pyramid_creases0.h +++ b/regression/shapes/catmark_pyramid_creases0.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_pyramid_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_pyramid_creases1.h b/regression/shapes/catmark_pyramid_creases1.h index 5b66419b..b78863ad 100644 --- a/regression/shapes/catmark_pyramid_creases1.h +++ b/regression/shapes/catmark_pyramid_creases1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_pyramid_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_pyramid_creases2.h b/regression/shapes/catmark_pyramid_creases2.h index c0ae9dca..f2247e67 100644 --- a/regression/shapes/catmark_pyramid_creases2.h +++ b/regression/shapes/catmark_pyramid_creases2.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_pyramid_creases2 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_rook.h b/regression/shapes/catmark_rook.h index ad7ddd0d..fe436ab0 100644 --- a/regression/shapes/catmark_rook.h +++ b/regression/shapes/catmark_rook.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_rook = std::string( "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_square_hedit0.h b/regression/shapes/catmark_square_hedit0.h index 02b8c71d..bdb7715b 100644 --- a/regression/shapes/catmark_square_hedit0.h +++ b/regression/shapes/catmark_square_hedit0.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_square_hedit0 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_square_hedit1.h b/regression/shapes/catmark_square_hedit1.h index b8d2f913..fe7006fa 100644 --- a/regression/shapes/catmark_square_hedit1.h +++ b/regression/shapes/catmark_square_hedit1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_square_hedit1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_square_hedit2.h b/regression/shapes/catmark_square_hedit2.h index e18556a5..96a551b1 100644 --- a/regression/shapes/catmark_square_hedit2.h +++ b/regression/shapes/catmark_square_hedit2.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_square_hedit2 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_square_hedit3.h b/regression/shapes/catmark_square_hedit3.h index 87a5da9e..55f285bc 100644 --- a/regression/shapes/catmark_square_hedit3.h +++ b/regression/shapes/catmark_square_hedit3.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_square_hedit3 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_square_hedit4.h b/regression/shapes/catmark_square_hedit4.h index 5a2f2eb5..452b124c 100644 --- a/regression/shapes/catmark_square_hedit4.h +++ b/regression/shapes/catmark_square_hedit4.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_square_hedit4 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_tent.h b/regression/shapes/catmark_tent.h index e1cab440..b06fff6c 100644 --- a/regression/shapes/catmark_tent.h +++ b/regression/shapes/catmark_tent.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_tent = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_tent_creases0.h b/regression/shapes/catmark_tent_creases0.h index a559d309..400365a4 100644 --- a/regression/shapes/catmark_tent_creases0.h +++ b/regression/shapes/catmark_tent_creases0.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_tent_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_tent_creases1.h b/regression/shapes/catmark_tent_creases1.h index d698fc04..d79df0d9 100644 --- a/regression/shapes/catmark_tent_creases1.h +++ b/regression/shapes/catmark_tent_creases1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_tent_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_torus.h b/regression/shapes/catmark_torus.h index fc5278e8..8cd8085a 100644 --- a/regression/shapes/catmark_torus.h +++ b/regression/shapes/catmark_torus.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_torus = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_torus_creases0.h b/regression/shapes/catmark_torus_creases0.h index 9b462719..2d6de6a2 100644 --- a/regression/shapes/catmark_torus_creases0.h +++ b/regression/shapes/catmark_torus_creases0.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_torus_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/catmark_torus_creases1.h b/regression/shapes/catmark_torus_creases1.h index f118b56a..afabc355 100644 --- a/regression/shapes/catmark_torus_creases1.h +++ b/regression/shapes/catmark_torus_creases1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string catmark_torus_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/loop_cube.h b/regression/shapes/loop_cube.h index 6ef68916..61c8393d 100644 --- a/regression/shapes/loop_cube.h +++ b/regression/shapes/loop_cube.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string loop_cube = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/loop_cube_creases0.h b/regression/shapes/loop_cube_creases0.h index e251420e..52deff1f 100644 --- a/regression/shapes/loop_cube_creases0.h +++ b/regression/shapes/loop_cube_creases0.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string loop_cube_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/loop_cube_creases1.h b/regression/shapes/loop_cube_creases1.h index afc71087..92dc0148 100644 --- a/regression/shapes/loop_cube_creases1.h +++ b/regression/shapes/loop_cube_creases1.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string loop_cube_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/loop_icosahedron.h b/regression/shapes/loop_icosahedron.h index c5197c1f..c354fdaf 100644 --- a/regression/shapes/loop_icosahedron.h +++ b/regression/shapes/loop_icosahedron.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string loop_icosahedron = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/loop_saddle_edgecorner.h b/regression/shapes/loop_saddle_edgecorner.h index 9eb078d9..94fbbdce 100644 --- a/regression/shapes/loop_saddle_edgecorner.h +++ b/regression/shapes/loop_saddle_edgecorner.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string loop_saddle_edgecorner = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/loop_saddle_edgeonly.h b/regression/shapes/loop_saddle_edgeonly.h index 3fbc2dfd..2037a61a 100644 --- a/regression/shapes/loop_saddle_edgeonly.h +++ b/regression/shapes/loop_saddle_edgeonly.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string loop_saddle_edgeonly = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/loop_triangle_edgecorner.h b/regression/shapes/loop_triangle_edgecorner.h index 05b64ba3..e13a06c5 100644 --- a/regression/shapes/loop_triangle_edgecorner.h +++ b/regression/shapes/loop_triangle_edgecorner.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string loop_triangle_edgecorner = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n" diff --git a/regression/shapes/loop_triangle_edgeonly.h b/regression/shapes/loop_triangle_edgeonly.h index 1d131112..6f3aee5f 100644 --- a/regression/shapes/loop_triangle_edgeonly.h +++ b/regression/shapes/loop_triangle_edgeonly.h @@ -1,27 +1,27 @@ // -// Copyright 2013 Pixar +// 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: +// Licensed under the Apache License, Version 2.0 (the "Apache License") +// with the following modification; you may not use this file except in +// compliance with the Apache License and the following modification to it: +// Section 6. Trademarks. is 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. +// 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 to comply with Section 4(c) of +// the License and to reproduce the content of the NOTICE file. // -// You may obtain a copy of the License at +// You may obtain a copy of the Apache License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. +// Unless required by applicable law or agreed to in writing, software +// distributed under the Apache License with the above modification is +// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the Apache License for the specific +// language governing permissions and limitations under the Apache License. // + static const std::string loop_triangle_edgeonly = "# This file uses centimeters as units for non-parametric coordinates.\n" "\n"