Changeset 3284

Timestamp:

08/16/04 16:03:17 (9 years ago)

Author:

robert

Message:

Fix to order of materials

Files:

• OpenSceneGraph/trunk/src/osgPlugins/obj/glm.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgPlugins/obj/glm.cpp

@@ -839 +839 @@
       sscanf(buf, "%s %s", buf, buf);
       
-      /*group->material =*/ material = _glmFindMaterial(model, buf);
-
-      // a hack by Robert Osfield to account for usemtl being infront
-      // or the group, or after - but only one line after.
-      // original code always assigned material to current group.
-      if (previousLineWas_g || firstGroup) group->material = material;
+      material = _glmFindMaterial(model, buf);
+      
+      group->material = material;
 
       break;