kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

-> Path handling fix for External references in FLT import

Browse Source 
FLT importer had problems with external references that used
relative paths. Fixed.
This commit is contained in:
Geoffrey Bantle 2008-03-19 19:23:42 +00:00
parent 285870d53b
commit 0899bccef5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
release/scripts/flt_import.py
View File

@ -1328,11 +1328,17 @@ class XRef(InterNode):
self.props['comment'] = '' self.props['comment'] = ''
self.parse_record() self.parse_record()
xref_filename = self.props['3t200!filename'] xref_filename = self.props['3t200!filename'] #I dont even think there is a reason to keep this around...
if not os.path.isabs(xref_filename):
absname = os.path.join(os.path.dirname(self.header.filename), xref_filename)
else:
absname = xref_filename
self.props['id'] = 'X: ' + Blender.sys.splitext(Blender.sys.basename(xref_filename))[0] #this is really wrong as well.... self.props['id'] = 'X: ' + Blender.sys.splitext(Blender.sys.basename(xref_filename))[0] #this is really wrong as well....
if global_prefs['doxrefs'] and os.path.exists(xref_filename) and not self.header.grr.xrefs.has_key(xref_filename): if global_prefs['doxrefs'] and os.path.exists(absname) and not self.header.grr.xrefs.has_key(xref_filename):
self.xref = Database(xref_filename, self.header.grr, self) self.xref = Database(absname, self.header.grr, self)
self.header.grr.xrefs[xref_filename] = self.xref self.header.grr.xrefs[xref_filename] = self.xref
else: else:
self.xref = None self.xref = None
@ -1853,6 +1859,9 @@ class Database(InterNode):
print 'Parsing:', filename print 'Parsing:', filename
print print
#check to see if filename is a relative path
#filename = os.path.abspath(filename)
self.fw = flt_filewalker.FltIn(filename) self.fw = flt_filewalker.FltIn(filename)
self.filename = filename self.filename = filename
self.bname = os.path.splitext(os.path.basename(filename))[0] self.bname = os.path.splitext(os.path.basename(filename))[0]