Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use library argument for bpy.path.abspath in case of linked nodes.

Browse Source
This commit is contained in:
Campbell Barton
2012-11-03 15:05:09 +00:00
parent eb87529e23
commit 060ea498b0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/blender/addon/osl.py
View File

@@ -39,7 +39,7 @@ def update_script_node(node, report):
if node.mode == 'EXTERNAL': if node.mode == 'EXTERNAL':
# compile external script file # compile external script file
script_path = bpy.path.abspath(node.filepath) script_path = bpy.path.abspath(node.filepath, library=node.id_data.library)
script_path_noext, script_ext = os.path.splitext(script_path) script_path_noext, script_ext = os.path.splitext(script_path)
if script_ext == ".oso": if script_ext == ".oso":
@@ -75,7 +75,7 @@ def update_script_node(node, report):
elif node.mode == 'INTERNAL' and node.script: elif node.mode == 'INTERNAL' and node.script:
# internal script, we will store bytecode in the node # internal script, we will store bytecode in the node
script = node.script script = node.script
osl_path = bpy.path.abspath(script.filepath) osl_path = bpy.path.abspath(script.filepath, library=script.library)
if script.is_in_memory or script.is_dirty or script.is_modified or not os.path.exists(osl_path): 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 # write text datablock contents to temporary file
@@ -97,7 +97,10 @@ def update_script_node(node, report):
node.bytecode = oso.read() node.bytecode = oso.read()
oso.close() oso.close()
except: except:
report({'ERROR'}, "Can't read OSO bytecode to store in node at " + oso_path) import traceback
traceback.print_exc()
report({'ERROR'}, "Can't read OSO bytecode to store in node at %r" % oso_path)
ok = False ok = False
else: else: