[Bf-blender-cvs] [b5846ebce78] master: Fix T77603: OSL parser fails when script ends with comment without newline

Jacques Lucke noreply at git.blender.org
Mon Jun 8 17:02:18 CEST 2020


Commit: b5846ebce7863a59f6bbd00cf676486a7b4e0b76
Author: Jacques Lucke
Date:   Mon Jun 8 17:01:47 2020 +0200
Branches: master
https://developer.blender.org/rBb5846ebce7863a59f6bbd00cf676486a7b4e0b76

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

Reviewers: brecht

Differential Revision: https://developer.blender.org/D7958

===================================================================

M	intern/cycles/blender/addon/osl.py

===================================================================

diff --git a/intern/cycles/blender/addon/osl.py b/intern/cycles/blender/addon/osl.py
index dd92ce642d4..90d349abb2e 100644
--- a/intern/cycles/blender/addon/osl.py
+++ b/intern/cycles/blender/addon/osl.py
@@ -84,7 +84,7 @@ def update_script_node(node, report):
         if script.is_in_memory or script.is_dirty or script.is_modified or not os.path.exists(osl_path):
             # write text datablock contents to temporary file
             osl_file = tempfile.NamedTemporaryFile(mode='w', suffix=".osl", delete=False)
-            osl_file.write(script.as_string())
+            osl_file.write(script.as_string() + "\n")
             osl_file.close()
 
             ok, oso_path = osl_compile(osl_file.name, report)



More information about the Bf-blender-cvs mailing list