Changeset 1404 for GTP/trunk/Lib/Vis/Preprocessing/src/X3dParser.cpp

Timestamp:

09/18/06 02:23:47 (18 years ago)

Author:

mattausch

Message:

debugging after merge

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/X3dParser.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/X3dParser.cpp

@@ -250 +250 @@
                          for (tit = triangles.begin(); tit != tit_end; ++ tit)
                          {
-                                 cout << "triangle: " << *tit << endl;
+                                 //cout << "triangle: " << *tit << endl;
                                  TriangleIntersectable *ti = new TriangleIntersectable(*tit);
                                  mCurrentNode->mGeometry.push_back(ti);
@@ -292 +292 @@
                                  mCurrentNode->mGeometry.push_back(mi);
 
-                                 if (mCurrentMaterial)
+                                 if (mCurrentMaterial && !mCurrentMesh->mMaterial)
                                  {
                                          // HACK: add the material to the mesh directly if no material yet
-                                         if (!mCurrentMesh->mMaterial)
-                                                 mCurrentMesh->mMaterial = mCurrentMaterial;
+                                         mCurrentMesh->mMaterial = mCurrentMaterial;
                                  }
                          }