[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59147] trunk/blender/release/scripts/ modules/bpy_extras/image_utils.py: fix [#36455] importing obj data after saving doesn't work

[Campbell Barton]

Revision: 59147
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59147
Author:   campbellbarton
Date:     2013-08-15 00:32:12 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
fix [#36455] importing obj data after saving doesn't work

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy_extras/image_utils.py

Modified: trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/image_utils.py	2013-08-14 23:32:00 UTC (rev 59146)
+++ trunk/blender/release/scripts/modules/bpy_extras/image_utils.py	2013-08-15 00:32:12 UTC (rev 59147)
@@ -105,8 +105,16 @@
             if relpath is not None:
                 # make relative
                 from bpy.path import relpath as relpath_fn
-                image.filepath_raw = relpath_fn(path, start=relpath)
+                # can't always find the relative path
+                # (between drive letters on windows)
+                try:
+                    filepath_rel = relpath_fn(path, start=relpath)
+                except ValueError:
+                    filepath_rel = None
 
+                if filepath_rel is not None:
+                    image.filepath_raw = filepath_rel
+
         return image
 
     def _recursive_search(paths, filename_check):