FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix to order of materials

Browse Source
This commit is contained in:
Robert Osfield 2004-08-16 14:03:17 +00:00
parent 87a2a282be
commit dc0bc861b2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgPlugins/obj/glm.cpp
View File

@ -838,12 +838,9 @@ _glmSecondPass(GLMmodel* model, FILE* file)
fgets(buf, sizeof(buf), file); fgets(buf, sizeof(buf), file);
sscanf(buf, "%s %s", buf, buf); sscanf(buf, "%s %s", buf, buf);
/*group->material =*/ material = _glmFindMaterial(model, buf); material = _glmFindMaterial(model, buf);
// a hack by Robert Osfield to account for usemtl being infront group->material = material;
// 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;
break; break;
case 'o': /* group */ case 'o': /* group */