diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-20 19:06:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-20 19:06:46 +0400 |
commit | 874c29cea8e6f9bc411fccf2d6f4cb07e94328d0 (patch) | |
tree | 5971e577cf7c02e05a1e37b5ad058c71a6744877 /release/scripts/import_obj.py | |
parent | 7555bfa793a2b0fc187c6211c56986f35b2d7b09 (diff) | |
parent | c5bc4e4fb1a33eda8c31f2ea02e91f32f74c8fa5 (diff) |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
Diffstat (limited to 'release/scripts/import_obj.py')
-rw-r--r-- | release/scripts/import_obj.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/import_obj.py b/release/scripts/import_obj.py index 42cdac4dc35..493354601a6 100644 --- a/release/scripts/import_obj.py +++ b/release/scripts/import_obj.py @@ -537,6 +537,7 @@ def get_float_func(filepath): ''' file= open(filepath, 'rU') for line in file: #.xreadlines(): + line = line.lstrip() if line.startswith('v'): # vn vt v if ',' in line: return lambda f: float(f.replace(',', '.')) @@ -590,6 +591,7 @@ def load_obj(filepath, CLAMP_SIZE= 0.0, CREATE_FGONS= True, CREATE_SMOOTH_GROUPS time_sub= sys.time() file= open(filepath, 'rU') for line in file: #.xreadlines(): + line = line.lstrip() # rare cases there is white space at the start of the line if line.startswith('v '): line_split= line.split() |