Skip to content

Support OSL code generated from image shaders in MaterialX 1.38.10#2160

Merged
sebastienblor merged 4 commits intoAutodesk:masterfrom
AdrienHerubel:AdrienHerubel-patch-1
Dec 18, 2024
Merged

Support OSL code generated from image shaders in MaterialX 1.38.10#2160
sebastienblor merged 4 commits intoAutodesk:masterfrom
AdrienHerubel:AdrienHerubel-patch-1

Conversation

@AdrienHerubel
Copy link
Copy Markdown
Contributor

This PR adds support for the OSL code generated for image shaders by MaterialX 1.38.10.

In MaterialX 1.38.8 the OSL shader generator will create struct texturesource parameters such as :

    textureresource  shader_file = {\"\", \"\"}
    [[
        string widget = \"filename\"
    ]],

In MaterialX 1.38.10 the shader generator will split the textureresource shader in two parameters :

    string shader_file = \"\"
    [[
        string widget = \"filename\"
    ]],
    string shader_file_colorspace = \"\"
    [[
        string widget = \"colorspace\"
    ]],

cpichard
cpichard previously approved these changes Dec 18, 2024
@sebastienblor sebastienblor merged commit 1d6208a into Autodesk:master Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants