Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/importer/material.cc

Timestamp:

Mar 1, 2005, 9:50:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/importer/material.cc (modified) (2 diffs)

orxonox/branches/trackManager/src/importer/material.cc

@@ -16 +16 @@
 
 #include "material.h"
+
+#include "texture.h"
+#include <stdlib.h>
+#include <string.h>
 
 using namespace std;
@@ -112 +116 @@
   while (searcher != NULL)
     {
-      PRINTF(2)(".");
+      PRINT(2)(".");
       if (!strcmp (searcher->getName(), mtlName))
         {
-          PRINTF(2)("found.\n");
+          PRINT(2)("found.\n");
           return searcher;
         }
       searcher = searcher->nextMat;
     }
-  PRINTF(2)("not found\n");
+  PRINT(2)("not found\n");
   return NULL;
 }