|
@@ -268,15 +268,17 @@ copy_maya_file(const Filename &source, const Filename &dest,
|
|
|
_curr_idx++;
|
|
_curr_idx++;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Get all the shaders so we can determine the set of textures.
|
|
|
|
|
- _shaders.clear();
|
|
|
|
|
- collect_shaders();
|
|
|
|
|
- int num_shaders = _shaders.get_num_shaders();
|
|
|
|
|
- for (int i = 0; i < num_shaders; i++) {
|
|
|
|
|
- MayaShader *shader = _shaders.get_shader(i);
|
|
|
|
|
- for (size_t j = 0; j < shader->_all_maps.size(); j++) {
|
|
|
|
|
- if (!extract_texture(*shader->_all_maps[j], dir)) {
|
|
|
|
|
- return false;
|
|
|
|
|
|
|
+ if (!_omit_tex) {
|
|
|
|
|
+ // Get all the shaders so we can determine the set of textures.
|
|
|
|
|
+ _shaders.clear();
|
|
|
|
|
+ collect_shaders();
|
|
|
|
|
+ int num_shaders = _shaders.get_num_shaders();
|
|
|
|
|
+ for (int i = 0; i < num_shaders; i++) {
|
|
|
|
|
+ MayaShader *shader = _shaders.get_shader(i);
|
|
|
|
|
+ for (size_t j = 0; j < shader->_all_maps.size(); j++) {
|
|
|
|
|
+ if (!extract_texture(*shader->_all_maps[j], dir)) {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -329,7 +331,7 @@ copy_maya_file(const Filename &source, const Filename &dest,
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
|
bool MayaCopy::
|
|
bool MayaCopy::
|
|
|
extract_texture(MayaShaderColorDef &color_def, CVSSourceDirectory *dir) {
|
|
extract_texture(MayaShaderColorDef &color_def, CVSSourceDirectory *dir) {
|
|
|
- Filename texture_filename =
|
|
|
|
|
|
|
+ Filename texture_filename =
|
|
|
_path_replace->convert_path(color_def._texture_filename);
|
|
_path_replace->convert_path(color_def._texture_filename);
|
|
|
if (!texture_filename.exists()) {
|
|
if (!texture_filename.exists()) {
|
|
|
nout << "*** Error: texture " << texture_filename
|
|
nout << "*** Error: texture " << texture_filename
|