Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-12-13 01:01:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-13 01:01:39 +0400
commit8115753fd280c4e23f9d86508184ed057a9a2099 (patch)
treea68a1b0d219f3521a41a23ed1f358a530b388978 /release/scripts/modules
parent80da50270dfd4c330302813aa3a92240a9361865 (diff)
parent01478a3743f1d1fe3d641ff498953af027ca2e60 (diff)
svn merge ^/trunk/blender -r42564:42586
Diffstat (limited to 'release/scripts/modules')
-rw-r--r--release/scripts/modules/bpy/path.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py
index 4173d71b39c..98a3c81d65a 100644
--- a/release/scripts/modules/bpy/path.py
+++ b/release/scripts/modules/bpy/path.py
@@ -54,7 +54,7 @@ def abspath(path, start=None, library=None):
"""
if path.startswith("//"):
if library:
- start = abspath(_os.path.dirname(library.filepath))
+ start = _os.path.dirname(abspath(library.filepath))
return _os.path.join(_os.path.dirname(_bpy.data.filepath)
if start is None else start,
path[2:],