From b34973b55aad5705bb5b65c9c6f834d3cfd9f7d3 Mon Sep 17 00:00:00 2001
From: Josh Yelon <jyelon@gmail.com>
Date: Tue, 11 Dec 2007 05:45:06 +0000
Subject: [PATCH] Fixed a recently-introduced bug involving the default uvset
 name

---
 pandatool/src/mayaegg/mayaToEggConverter.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pandatool/src/mayaegg/mayaToEggConverter.cxx b/pandatool/src/mayaegg/mayaToEggConverter.cxx
index 8f5b422157..6e1109b2ff 100644
--- a/pandatool/src/mayaegg/mayaToEggConverter.cxx
+++ b/pandatool/src/mayaegg/mayaToEggConverter.cxx
@@ -2699,7 +2699,9 @@ set_shader_legacy(EggPrimitive &primitive, const MayaShader &shader,
         if (uvset_name.find("not found") == -1) {
           primitive.add_texture(new_tex);
           color_def->_uvset_name.assign(uvset_name.c_str());
-          new_tex->set_uv_name(color_def->_uvset_name);
+          if (uvset_name != "map1") {
+            new_tex->set_uv_name(uvset_name);
+          }
           if (i == (int)shader._color.size()-1 && is_decal) {
             dummy_uvset_name.assign(color_def->_uvset_name);
           }