From 38125ca311b25095b4564e1e82b00e049dfa7465 Mon Sep 17 00:00:00 2001 From: "gman@google.com" Date: Sat, 11 Jul 2009 03:32:56 +0000 Subject: Fix for multiple shaders I'm a little concerned that it renames the shaders which means the developer has no way to lookup "phong.fx" etc but I didn't see an easy way to get that info out of the collada file from the FCollada API. But he can at least look up the name of the Effect from Max. Review URL: http://codereview.chromium.org/149498 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20458 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/import/cross/collada.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'o3d') diff --git a/o3d/import/cross/collada.cc b/o3d/import/cross/collada.cc index 6379274..c9a6537a 100644 --- a/o3d/import/cross/collada.cc +++ b/o3d/import/cross/collada.cc @@ -1954,7 +1954,7 @@ Effect* Collada::BuildEffect(FCDocument* doc, FCDEffect* collada_effect) { String file_name = "embedded-shader-" + IntToString(unique_filename_counter_) + ".fx"; file_path = FilePath(FILE_PATH_LITERAL("shaders")); - file_path.Append(UTF8ToFilePath(file_name)); + file_path = file_path.Append(UTF8ToFilePath(file_name)); } else if (code->GetType() == FCDEffectCode::INCLUDE) { fstring path = code->GetFilename(); file_path = WideToFilePath(path.c_str()); -- cgit v1.1