summaryrefslogtreecommitdiffstats
path: root/o3d/import
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-11 03:32:56 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-11 03:32:56 +0000
commit38125ca311b25095b4564e1e82b00e049dfa7465 (patch)
tree125b06c1d3cb1c7c6f9693fec8a83b5edc64c44b /o3d/import
parent0288c4228f20e07762c4322a5c2d868d4f61c6f1 (diff)
downloadchromium_src-38125ca311b25095b4564e1e82b00e049dfa7465.zip
chromium_src-38125ca311b25095b4564e1e82b00e049dfa7465.tar.gz
chromium_src-38125ca311b25095b4564e1e82b00e049dfa7465.tar.bz2
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
Diffstat (limited to 'o3d/import')
-rw-r--r--o3d/import/cross/collada.cc2
1 files changed, 1 insertions, 1 deletions
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());