diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-04-11 04:09:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-04-11 04:09:56 +0400 |
| commit | 3df52d4e19790df7a7a9c80e37c5724613427b86 (patch) | |
| tree | 61852324bffcf7dfe7ac4e5c37fa881e68d49e3b /source/blender/python/intern/bpy.c | |
| parent | 09c7d5aeb84443feabb5d8e03bf268cfe7a34acc (diff) | |
| parent | e37dc17991668d696497b5af70ad8133db71b107 (diff) | |
Merged changes in the trunk up to revision 36092.
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'source/blender/python/intern/bpy.c')
| -rw-r--r-- | source/blender/python/intern/bpy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 1d1c7f3efe3..9a420631088 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -42,6 +42,7 @@ #include "bpy_operator.h" #include "BLI_path_util.h" +#include "BLI_string.h" #include "BLI_bpath.h" #include "BLI_utildefines.h" @@ -117,7 +118,7 @@ static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObjec } else { lib= BLI_bpathIterator_getLib(bpi); - if (lib && (strcmp(lib, BLI_bpathIterator_getBasePath(bpi)))) { /* relative path to the library is NOT the same as our blendfile path, return an absolute path */ + if (lib && (BLI_path_cmp(lib, BLI_bpathIterator_getBasePath(bpi)))) { /* relative path to the library is NOT the same as our blendfile path, return an absolute path */ BLI_bpathIterator_getPathExpanded(bpi, filepath_expanded); } else { |