blender/cycles
8
16
Fork 11
Code Issues 3 Pull Requests 5 Releases Activity

Update osl to work with version 1.13.6 #11

Closed
howetuft wants to merge 1 commits from howetuft/cycles:osl into main
pull from: howetuft/cycles:osl
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 1 Files Changed 3 +36 -4
howetuft commented 2024-03-02 11:49:44 +01:00
Contributor
Copy Link

While keeping compatibility with older versions.

While keeping compatibility with older versions.
howetuft added 1 commit 2024-03-02 11:49:45 +01:00 
While keeping compatibility with older versions.
howetuft requested review from Brecht Van Lommel 2024-03-02 11:50:19 +01:00
howetuft requested review from Thomas Dinges 2024-03-02 11:52:16 +01:00
Thomas Dinges commented 2024-03-02 13:34:37 +01:00
Owner
Copy Link

Thanks for the patch. The compatibility with the newer OSL lib was already added to blender/cycles in 798a0b301e64: Cycles: update OSL to work with version 1.13.5

This will be merged with the standalone repository for Blender 4.1 (release end of March).

Thanks for the patch. The compatibility with the newer OSL lib was already added to blender/cycles in [798a0b301e64: Cycles: update OSL to work with version 1.13.5](https://projects.blender.org/blender/blender/commit/798a0b301e640e73ae12e6f8a36a66746893bff1) This will be merged with the standalone repository for Blender 4.1 (release end of March).
Thomas Dinges closed this pull request 2024-03-02 13:34:37 +01:00
howetuft commented 2024-03-02 14:19:48 +01:00
Author
Contributor
Copy Link

Ah OK! Did not notice that, sorry for the inconvenience and thank you for your quick answer.

Ah OK! Did not notice that, sorry for the inconvenience and thank you for your quick answer.

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Brecht Van Lommel
Thomas Dinges
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Reference: blender/cycles#11
No description provided.
Delete Branch "howetuft/cycles:osl"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?