Repository navigation
Merge main (v1.1.2) into dev_1.2 - #336
Open
AdrienHerubel wants to merge 5 commits into
Open
AdrienHerubel wants to merge 5 commits into
AdrienHerubel wants to merge 5 commits into
Conversation
Add Adobe OpenPBR BSDF to the Resources section in README. This links to Adobe's open-source BSDF implementation of OpenPBR.
This changelist merges v1.1.1 development from dev_1.1.1 to main, in preparation for marking the release of OpenPBR v1.1.1.
This PR merges from dev_1.1.2 to main in preparation for marking the release of OpenPBR v1.1.2
…ation#335) Updated the CHANGELOG for version 1.1.2.
Brings the v1.1.2 changes into dev_1.2. Conflicts were resolved against the v1.1.1 squash commit on main as the common base, keeping the dev_1.2 structure and porting the 1.1.2 changes on top. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
AdrienHerubel
marked this pull request as ready for review
November 6, 2026 12:11
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges
main(v1.1.2) intodev_1.2so that the 1.2 development branch picks up the 1.1.2 patch release.Because 1.1.1 reached
mainanddev_1.2(#296) as separate squash commits, a plain merge produced many spurious conflicts. Conflicts were resolved using main's 1.1.1 commit as the common base, keeping thedev_1.2structure and wording and porting the 1.1.2 changes on top.Please merge with a merge commit (not squash), so that
mainstays an ancestor ofdev_1.2and future merges are clean.Changes brought in from 1.1.2
Specification (
index.html)subsurface_radiusandtransmission_depthdescriptions and parameter tables ("default unit: cm").Vlachos2010reference.Parametrization (
parametrization.md.html)(cm)defaults fortransmission_depthandsubsurface_radius.subsurface_colorrange isMaterialX (
reference/open_pbr_surface.mtlx)dev_1.2versions of the nodedef version (1.2), the thin-walled subsurface graph (already equivalent to the Fix thin-walled subsurface color in MaterialX graph #321 fix) and the metallic Fresnel graph (Clamp metallic Fresnel after specular_weight scaling via F0 and F82 #316).Examples, README, CHANGELOG
subsurface_radius/subsurface_radius_scalesplit for milk and petroleum.open_pbr_light_bulb_2700k.mtlxkeepsemission_weight = 1, which main removed for 1.1.x but which 1.2 needs sinceemission_weightdefaults to 0.[1.2] - Unreleasedsection placed above 1.1.2 (unchanged, not yet converted to the new style).Not changed
dev_1.2; to be updated with the 1.2 version bump.Visual diff
Removed text in red, added text in green, comparing
dev_1.2before and after this merge.Screenshots of each changed region, in document order (25)
🤖 Generated with Claude Code