diff options
author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-24 02:46:08 +0000 |
---|---|---|
committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-24 02:46:08 +0000 |
commit | e8768152bbe73727a1fa67698b527b8676d09fcd (patch) | |
tree | 4febe41829dd6f726d428d43c3f1478c42e63390 /o3d/converter | |
parent | 0a49b0f7dba1433a73e1c98e029b0d6561ce1fb8 (diff) | |
download | chromium_src-e8768152bbe73727a1fa67698b527b8676d09fcd.zip chromium_src-e8768152bbe73727a1fa67698b527b8676d09fcd.tar.gz chromium_src-e8768152bbe73727a1fa67698b527b8676d09fcd.tar.bz2 |
Thanks to amarinichev for extensive help, ported o3dConverter's
--convert-cg-to-glsl command line option to Windows. Ported to Python
2.4, which is what Cygwin and depot_tools both contain. Fixed regular
expression match and cgc.exe determination in Cygwin Python. Added
explicit invocation of python.exe to collada.cc.
BUG=none
TEST=converted teapot sample with --convert-cg-to-glsl on Windows and Mac
TBR=amarinichev
Review URL: http://codereview.chromium.org/1715009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45525 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/converter')
-rw-r--r-- | o3d/converter/cross/converter_main.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/o3d/converter/cross/converter_main.cc b/o3d/converter/cross/converter_main.cc index ab72b61..7822fe0 100644 --- a/o3d/converter/cross/converter_main.cc +++ b/o3d/converter/cross/converter_main.cc @@ -115,6 +115,7 @@ int CrossMain(int argc, char**argv) { << " writes six separate PNGs with suffixes _posx, _negx, etc.\n" << "--convert-cg-to-glsl\n" << " Convert shaders using an external tool.\n" + << " Requires python on PATH.\n" << "--converter-tool=<filename> [default: " << converter_tool.value() << "]\n" << " Specifies the shader converter tool.\n"; |