diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-01-05 22:21:59 +0300 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-01-05 22:21:59 +0300 |
commit | 1bca8389dd979e669ed9f26ba876939b540dab66 (patch) | |
tree | 2a7f8447ea8166de6b08cc6719974d143b02d0ef /source/blender/collada | |
parent | 06d548bd6fdb9d3e4fc99ecf3b26617648e6b73c (diff) | |
parent | 73f84b24fca541caa4aaec02d946b887ddfb216b (diff) |
Merge from trunk -r 25003:25745.
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 38f96a786e5..ef36a2eea9a 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -22,7 +22,7 @@ extern "C" #include "BKE_DerivedMesh.h" #include "BKE_fcurve.h" #include "BKE_animsys.h" -#include "BLI_util.h" +#include "BLI_path_util.h" #include "BLI_fileops.h" #include "ED_keyframing.h" } diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 6fa9656391b..26e95c378a6 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -54,7 +54,7 @@ extern "C" #include "BKE_texture.h" #include "BKE_fcurve.h" #include "BKE_depsgraph.h" -#include "BLI_util.h" +#include "BLI_path_util.h" #include "BKE_displist.h" #include "BLI_math.h" #include "BKE_scene.h" |