Skip to content

Merge main (v1.1.2) into dev_1.2 - #336

Open
AdrienHerubel wants to merge 5 commits into
AcademySoftwareFoundation:dev_1.2from
AdrienHerubel:merge-main-into-dev_1.2
Open

AdrienHerubel wants to merge 5 commits into
AcademySoftwareFoundation:dev_1.2from
AdrienHerubel:merge-main-into-dev_1.2

Conversation

@AdrienHerubel

Copy link
Copy Markdown
Contributor

Merges main (v1.1.2) into dev_1.2 so that the 1.2 development branch picks up the 1.1.2 patch release.

Because 1.1.1 reached main and dev_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 the dev_1.2 structure and wording and porting the 1.1.2 changes on top.

Please merge with a merge commit (not squash), so that main stays an ancestor of dev_1.2 and future merges are clean.

Changes brought in from 1.1.2

Specification (index.html)

Parametrization (parametrization.md.html)

MaterialX (reference/open_pbr_surface.mtlx)

Examples, README, CHANGELOG

  • Fix: invalid OpenPBR parameterizations in some mtlx examples #313: Example color fixes (brass, cesium, gold, lithium, potassium, rubidium, sodium) and the subsurface_radius/subsurface_radius_scale split for milk and petroleum.
  • open_pbr_light_bulb_2700k.mtlx keeps emission_weight = 1, which main removed for 1.1.x but which 1.2 needs since emission_weight defaults to 0.
  • README: Adobe OpenPBR BSDF reference (Add Adobe OpenPBR BSDF reference #299).
  • CHANGELOG: main's new format, with the existing [1.2] - Unreleased section placed above 1.1.2 (unchanged, not yet converted to the new style).

Not changed

  • The spec header still reads "Specification v1.1, 2024-06-28" on 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.2 before and after this merge.

Screenshots of each changed region, in document order (25)

Visual diff, part 1 of 25

Visual diff, part 2 of 25

Visual diff, part 3 of 25

Visual diff, part 4 of 25

Visual diff, part 5 of 25

Visual diff, part 6 of 25

Visual diff, part 7 of 25

Visual diff, part 8 of 25

Visual diff, part 9 of 25

Visual diff, part 10 of 25

Visual diff, part 11 of 25

Visual diff, part 12 of 25

Visual diff, part 13 of 25

Visual diff, part 14 of 25

Visual diff, part 15 of 25

Visual diff, part 16 of 25

Visual diff, part 17 of 25

Visual diff, part 18 of 25

Visual diff, part 19 of 25

Visual diff, part 20 of 25

Visual diff, part 21 of 25

Visual diff, part 22 of 25

Visual diff, part 23 of 25

Visual diff, part 24 of 25

Visual diff, part 25 of 25

🤖 Generated with Claude Code

nurusanwe and others added 5 commits April 17, 2026 11:52
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
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
AdrienHerubel marked this pull request as ready for review November 6, 2026 12:11

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants