Page MenuHome
Differential D7958

Fix T77603: OSL parser fails when script ends with comment without newline
ClosedPublic
Actions

Authored by Jacques Lucke (JacquesLucke) on Jun 8 2020, 4:53 PM.

Details

Reviewers
Brecht Van Lommel (brecht)
Maniphest Tasks
T77603: OSL files fail to compile when shader ends with a comment
Commits
rB5439f43e8830: Fix T77603: OSL parser fails when script ends with comment without newline
rC02411743b4d8: Fix T77603: OSL parser fails when script ends with comment without newline
rBb5846ebce786: Fix T77603: OSL parser fails when script ends with comment without newline
Summary

This is probably a bug upstream. This fix just adds a newline character to
the end of the script to make it work.

Diff Detail

Repository
rB Blender

Event Timeline

Jacques Lucke (JacquesLucke) requested review of this revision.Jun 8 2020, 4:53 PM
Jacques Lucke (JacquesLucke) created this revision.
Jacques Lucke (JacquesLucke) added a task: T77603: OSL files fail to compile when shader ends with a comment.Jun 8 2020, 4:53 PM
Harbormaster completed remote builds in B8434: Diff 25639.Jun 8 2020, 4:54 PM
Brecht Van Lommel (brecht) accepted this revision.Jun 8 2020, 5:00 PM
This revision is now accepted and ready to land.Jun 8 2020, 5:00 PM
Jacques Lucke (JacquesLucke) added a comment.Jun 8 2020, 5:01 PM

Might have been fixed by a new version of osl. The line that prints the error was removed here: https://github.com/imageworks/OpenShadingLanguage/commit/f4ec638e6b4d031fb1076036f6777af546805088. Search for preprocessor exception caught.

Closed by commit rBb5846ebce786: Fix T77603: OSL parser fails when script ends with comment without newline (authored by Jacques Lucke (JacquesLucke)). · Explain WhyJun 8 2020, 5:02 PM
This revision was automatically updated to reflect the committed changes.
Jacques Lucke (JacquesLucke) added a commit: rBb5846ebce786: Fix T77603: OSL parser fails when script ends with comment without newline.
Brecht Van Lommel (brecht) added a commit: rC02411743b4d8: Fix T77603: OSL parser fails when script ends with comment without newline.Jun 17 2020, 7:04 PM
Jeroen Bakker (jbakker) added a commit: rB5439f43e8830: Fix T77603: OSL parser fails when script ends with comment without newline.Jun 18 2020, 10:15 AM

Revision Contents
Changeset List

PathSize
intern/
cycles/
blender/
addon/
2 lines

Diff 25640

View Options

intern/cycles/blender/addon/osl.py

Loading...