Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CAM Simulator][1.0] Change usage of sample shader code to one with compatible license. #16899

Merged
merged 2 commits into from
Sep 30, 2024

Conversation

shaise
Copy link
Contributor

@shaise shaise commented Sep 28, 2024

Since the old SSAO shaders were under CC license which is not compatible with FreeCad's, I changed the code to use code samples from a book with MIT license which is compatible.

@github-actions github-actions bot added the Mod: CAM Related to the CAM/Path Workbench label Sep 28, 2024
@maxwxyz maxwxyz added this to the 1.0 milestone Sep 29, 2024
@maxwxyz maxwxyz added the Needs backport Needs backport to 1.0 label Sep 29, 2024
@yorikvanhavre yorikvanhavre merged commit 07eac6b into FreeCAD:main Sep 30, 2024
9 checks passed
chennes pushed a commit that referenced this pull request Sep 30, 2024
…ompatible license. (#16899)

* Change usage of sample shader code to one with compatible license.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113 pre-commit-ci[bot]@users.noreply.github.com>
@yorikvanhavre yorikvanhavre removed the Needs backport Needs backport to 1.0 label Sep 30, 2024
@yorikvanhavre
Copy link
Member

backported

@shaise shaise deleted the CamSimulator7 branch October 1, 2024 06:38
DerekSauer pushed a commit to DerekSauer/FreeCAD that referenced this pull request Oct 15, 2024
…ompatible license. (FreeCAD#16899)

* Change usage of sample shader code to one with compatible license.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113 pre-commit-ci[bot]@users.noreply.github.com>
hoshengwei pushed a commit to hoshengwei/FreeCAD that referenced this pull request Oct 15, 2024
…ompatible license. (FreeCAD#16899)

* Change usage of sample shader code to one with compatible license.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113 pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mod: CAM Related to the CAM/Path Workbench
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants