Changeset 3121 in orxonox.OLD

Timestamp:

Dec 7, 2004, 12:54:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: Group-Name-fixes

File:

• orxonox/branches/images/importer/object.cc (modified) (3 diffs)

orxonox/branches/images/importer/object.cc

@@ -219 +219 @@
   if (verbose >= 2)
     printf("Adding new Group\n");
-  group->name = NULL;
+  group->name = "";
   group->faceMode = -1;
   group->faceCount = 0;  
@@ -454 +454 @@
   if (verbose >=3)
     printf ("Read Group: %s.\n", groupString);
-  // setting the group name if not default.
-  if (strcmp(currentGroup->name, "default"))
-    {
-      currentGroup->name = new char [strlen(groupString)+1];
-      strcpy(currentGroup->name, groupString);
-    }
   if (groupCount != 0 && currentGroup->faceCount>0)
     {
@@ -465 +459 @@
       currentGroup = currentGroup->next = new Group;
       initGroup(currentGroup);
+    }
+  // setting the group name if not default.
+  if (strcmp(groupString, "default"))
+    {
+      currentGroup->name = new char [strlen(groupString)+1];
+      strcpy(currentGroup->name, groupString);
     }
   ++groupCount;