Permalink
Browse files

Apache 2.0 License

  • Loading branch information...
Zap Andersson
Zap Andersson committed Feb 1, 2018
1 parent 29e3236 commit b8f6f569696c596e5a96ac9f8757a6ee5114cacb
Showing with 11 additions and 7 deletions.
  1. +1 −1 LICENSE.txt
  2. +1 −1 OSL/ADN-User Submitted/MadsD/ConstantBiasScale.osl
  3. +2 −1 OSL/ADN-User Submitted/README.md
  4. +3 −1 OSL/README.md
  5. +4 −3 README.md
View
@@ -50,4 +50,4 @@ You may add Your own copyright statement to Your modifications and may provide a
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, 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
END OF TERMS AND CONDITIONS
@@ -2,7 +2,7 @@
// ConstantBiasScale.osl, by Mads Drøschler
// Modified: 2018-01-17
// License: Apache 2.0 License
// MIT License, https://github.com/ADN-DevTech/3dsMax-OSL-Shaders/blob/master/LICENSE.txt
// https://github.com/ADN-DevTech/3dsMax-OSL-Shaders/blob/master/LICENSE.txt
shader ConstantBiasSCale
[[ string help="Constant Bias Scale, useful for converting and aligning vector spaces",
@@ -7,7 +7,8 @@ and OSL files will be flying left and right.
If not there, add to the header of your file that it is under the MIT license by adding
this line or something equivalent:
// License: MIT License, https://github.com/ADN-DevTech/3dsMax-OSL-Shaders/blob/master/LICENSE.txt
// License: Apache 2.0 License
// https://github.com/ADN-DevTech/3dsMax-OSL-Shaders/blob/master/LICENSE.txt
Each user builds their own subdirectory under this to place their shaders. Some may later
be promoted to other folders.
View
@@ -20,7 +20,9 @@ and OSL files will be flying left and right.
If not there, add to the header of your file that it is under the MIT license by adding this line
// License: MIT License, https://github.com/ADN-DevTech/3dsMax-OSL-Shaders/blob/master/LICENSE.txt
// License: Apache 2.0 License
// https://github.com/ADN-DevTech/3dsMax-OSL-Shaders/blob/master/LICENSE.txt
Each user builds their own subdirectory under this to place their shaders. Some may later
be promoted to other folders.
View
@@ -3,7 +3,7 @@
This will be the repo to hold shared OSL shaders for 3ds Max.
Note that 3ds Max neptune (currently in beta only) is the only version to support this standard.
All shaders in this repository are under the MIT License - see [LICENSE.txt](LICENSE.txt)
All shaders in this repository are under the Apache 2.0 License - see [LICENSE.txt](LICENSE.txt)
## Layout of the repository
@@ -45,9 +45,10 @@ These are shaders submitted by users. Please only upload shaders you've written
or where you can be certain the license is explicitly permissive. This is a sharing site
and OSL files will be flying left and right.
If not there, add to the header of your file that it is under the MIT license by adding this line
If not there, add to the header of your file that it is under the Apache 2.0 license by adding this line
// License: MIT License, https://github.com/ADN-DevTech/3dsMax-OSL-Shaders/blob/master/LICENSE.txt
// License: Apache 2.0 License
// https://github.com/ADN-DevTech/3dsMax-OSL-Shaders/blob/master/LICENSE.txt
Each user builds their own subdirectory under this to place their shaders. Some may later
be promoted to other folders.

0 comments on commit b8f6f56

Please sign in to comment.