Skip to content

Commit b6ac9b8

Browse files
tallytalwarpixar-oss
tallytalwar
authored and
pixar-oss
committed
Fix Licenses
(Internal change: 2331093)
1 parent 3dbd011 commit b6ac9b8

7 files changed

Lines changed: 19 additions & 133 deletions

File tree

‎pxr/usd/usd/coreValidators.cpp‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
11
//
22
// Copyright 2024 Pixar
33
//
4-
// Licensed under the Apache License, Version 2.0 (the "Apache License")
5-
// with the following modification; you may not use this file except in
6-
// compliance with the Apache License and the following modification to it:
7-
// Section 6. Trademarks. is deleted and replaced with:
8-
//
9-
// 6. Trademarks. This License does not grant permission to use the trade
10-
// names, trademarks, service marks, or product names of the Licensor
11-
// and its affiliates, except as required to comply with Section 4(c) of
12-
// the License and to reproduce the content of the NOTICE file.
13-
//
14-
// You may obtain a copy of the Apache License at
15-
//
16-
// http://www.apache.org/licenses/LICENSE-2.0
17-
//
18-
// Unless required by applicable law or agreed to in writing, software
19-
// distributed under the Apache License with the above modification is
20-
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21-
// KIND, either express or implied. See the Apache License for the specific
22-
// language governing permissions and limitations under the Apache License.
4+
// Licensed under the terms set forth in the LICENSE.txt file available at
5+
// https://openusd.org/license.
236
//
247

258
#include "pxr/usd/usd/validationError.h"

‎pxr/usd/usd/validatorTokens.cpp‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
11
//
22
// Copyright 2024 Pixar
33
//
4-
// Licensed under the Apache License, Version 2.0 (the "Apache License")
5-
// with the following modification; you may not use this file except in
6-
// compliance with the Apache License and the following modification to it:
7-
// Section 6. Trademarks. is deleted and replaced with:
8-
//
9-
// 6. Trademarks. This License does not grant permission to use the trade
10-
// names, trademarks, service marks, or product names of the Licensor
11-
// and its affiliates, except as required to comply with Section 4(c) of
12-
// the License and to reproduce the content of the NOTICE file.
13-
//
14-
// You may obtain a copy of the Apache License at
15-
//
16-
// http://www.apache.org/licenses/LICENSE-2.0
17-
//
18-
// Unless required by applicable law or agreed to in writing, software
19-
// distributed under the Apache License with the above modification is
20-
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21-
// KIND, either express or implied. See the Apache License for the specific
22-
// language governing permissions and limitations under the Apache License.
4+
// Licensed under the terms set forth in the LICENSE.txt file available at
5+
// https://openusd.org/license.
236
//
7+
248
#include "pxr/usd/usd/validatorTokens.h"
259

2610
PXR_NAMESPACE_OPEN_SCOPE

‎pxr/usd/usd/validatorTokens.h‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
11
//
22
// Copyright 2024 Pixar
33
//
4-
// Licensed under the Apache License, Version 2.0 (the "Apache License")
5-
// with the following modification; you may not use this file except in
6-
// compliance with the Apache License and the following modification to it:
7-
// Section 6. Trademarks. is deleted and replaced with:
8-
//
9-
// 6. Trademarks. This License does not grant permission to use the trade
10-
// names, trademarks, service marks, or product names of the Licensor
11-
// and its affiliates, except as required to comply with Section 4(c) of
12-
// the License and to reproduce the content of the NOTICE file.
13-
//
14-
// You may obtain a copy of the Apache License at
15-
//
16-
// http://www.apache.org/licenses/LICENSE-2.0
17-
//
18-
// Unless required by applicable law or agreed to in writing, software
19-
// distributed under the Apache License with the above modification is
20-
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21-
// KIND, either express or implied. See the Apache License for the specific
22-
// language governing permissions and limitations under the Apache License.
4+
// Licensed under the terms set forth in the LICENSE.txt file available at
5+
// https://openusd.org/license.
236
//
7+
248
#ifndef USD_VALIDATOR_TOKENS_H
259
#define USD_VALIDATOR_TOKENS_H
2610

‎pxr/usd/usdShade/testenv/testUsdShadeValidators.cpp‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
11
//
22
// Copyright 2024 Pixar
33
//
4-
// Licensed under the Apache License, Version 2.0 (the "Apache License")
5-
// with the following modification; you may not use this file except in
6-
// compliance with the Apache License and the following modification to it:
7-
// Section 6. Trademarks. is deleted and replaced with:
8-
//
9-
// 6. Trademarks. This License does not grant permission to use the trade
10-
// names, trademarks, service marks, or product names of the Licensor
11-
// and its affiliates, except as required to comply with Section 4(c) of
12-
// the License and to reproduce the content of the NOTICE file.
13-
//
14-
// You may obtain a copy of the Apache License at
15-
//
16-
// http://www.apache.org/licenses/LICENSE-2.0
17-
//
18-
// Unless required by applicable law or agreed to in writing, software
19-
// distributed under the Apache License with the above modification is
20-
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21-
// KIND, either express or implied. See the Apache License for the specific
22-
// language governing permissions and limitations under the Apache License.
4+
// Licensed under the terms set forth in the LICENSE.txt file available at
5+
// https://openusd.org/license.
236
//
247

258
#include "pxr/pxr.h"

‎pxr/usd/usdShade/validatorTokens.cpp‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
1-
// Copyright 2024 Pixar
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "Apache License")
4-
// with the following modification; you may not use this file except in
5-
// compliance with the Apache License and the following modification to it:
6-
// Section 6. Trademarks. is deleted and replaced with:
7-
//
8-
// 6. Trademarks. This License does not grant permission to use the trade
9-
// names, trademarks, service marks, or product names of the Licensor
10-
// and its affiliates, except as required to comply with Section 4(c) of
11-
// the License and to reproduce the content of the NOTICE file.
121
//
13-
// You may obtain a copy of the Apache License at
14-
//
15-
// http://www.apache.org/licenses/LICENSE-2.0
2+
// Copyright 2024 Pixar
163
//
17-
// Unless required by applicable law or agreed to in writing, software
18-
// distributed under the Apache License with the above modification is
19-
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20-
// KIND, either express or implied. See the Apache License for the specific
21-
// language governing permissions and limitations under the Apache License.
4+
// Licensed under the terms set forth in the LICENSE.txt file available at
5+
// https://openusd.org/license.
226
//
7+
238
#include "pxr/usd/usdShade/validatorTokens.h"
249

2510
PXR_NAMESPACE_OPEN_SCOPE

‎pxr/usd/usdShade/validatorTokens.h‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
11
//
22
// Copyright 2024 Pixar
33
//
4-
// Licensed under the Apache License, Version 2.0 (the "Apache License")
5-
// with the following modification; you may not use this file except in
6-
// compliance with the Apache License and the following modification to it:
7-
// Section 6. Trademarks. is deleted and replaced with:
8-
//
9-
// 6. Trademarks. This License does not grant permission to use the trade
10-
// names, trademarks, service marks, or product names of the Licensor
11-
// and its affiliates, except as required to comply with Section 4(c) of
12-
// the License and to reproduce the content of the NOTICE file.
13-
//
14-
// You may obtain a copy of the Apache License at
15-
//
16-
// http://www.apache.org/licenses/LICENSE-2.0
17-
//
18-
// Unless required by applicable law or agreed to in writing, software
19-
// distributed under the Apache License with the above modification is
20-
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21-
// KIND, either express or implied. See the Apache License for the specific
22-
// language governing permissions and limitations under the Apache License.
4+
// Licensed under the terms set forth in the LICENSE.txt file available at
5+
// https://openusd.org/license.
236
//
7+
248
#ifndef USDSHADE_VALIDATOR_TOKENS_H
259
#define USDSHADE_VALIDATOR_TOKENS_H
2610

‎pxr/usd/usdShade/validators.cpp‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
11
//
22
// Copyright 2024 Pixar
33
//
4-
// Licensed under the Apache License, Version 2.0 (the "Apache License")
5-
// with the following modification; you may not use this file except in
6-
// compliance with the Apache License and the following modification to it:
7-
// Section 6. Trademarks. is deleted and replaced with:
8-
//
9-
// 6. Trademarks. This License does not grant permission to use the trade
10-
// names, trademarks, service marks, or product names of the Licensor
11-
// and its affiliates, except as required to comply with Section 4(c) of
12-
// the License and to reproduce the content of the NOTICE file.
13-
//
14-
// You may obtain a copy of the Apache License at
15-
//
16-
// http://www.apache.org/licenses/LICENSE-2.0
17-
//
18-
// Unless required by applicable law or agreed to in writing, software
19-
// distributed under the Apache License with the above modification is
20-
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21-
// KIND, either express or implied. See the Apache License for the specific
22-
// language governing permissions and limitations under the Apache License.
4+
// Licensed under the terms set forth in the LICENSE.txt file available at
5+
// https://openusd.org/license.
236
//
247

258
#include "pxr/usd/sdr/shaderProperty.h"

0 commit comments

Comments
 (0)
⚡