Revision: 47924
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47924
Author: aramis_acg
Date: 2012-06-14 22:08:25 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
- bf_assimp: fix bug that causes some images to be not imported correctly.
Modified Paths:
--------------
branches/soc-2012-bratwurst/source/blender/assimp/ImageImporter.cpp
Modified: branches/soc-2012-bratwurst/source/blender/assimp/ImageImporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/ImageImporter.cpp
2012-06-14 21:56:45 UTC (rev 47923)
+++ branches/soc-2012-bratwurst/source/blender/assimp/ImageImporter.cpp
2012-06-14 22:08:25 UTC (rev 47924)
@@ -109,12 +109,12 @@
bool ImageImporter::convert_file()
{
- const char *filename = path.C_Str();
+ const char *image_filename = path.C_Str();
char dir[FILE_MAX];
char full_path[FILE_MAX];
- BLI_split_dir_part(filename, dir, sizeof(dir));
- BLI_join_dirfile(full_path, sizeof(full_path), dir,
scene_imp.get_file_path());
+ BLI_split_dir_part(scene_imp.get_file_path(), dir, sizeof(dir));
+ BLI_join_dirfile(full_path, sizeof(full_path), dir, image_filename);
ima = BKE_image_load_exists(full_path);
if (!ima) {
error("failed to convert image, image load fails");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
