From 1ca2ed972906bd66ff492edbc59979adff9533bc Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 26 Jun 2014 09:39:16 +0000 Subject: [PATCH] From Farshid Lashkari, "I've attached a small fix for the ply loader to support Windows style line endings when reading the header." git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14289 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgPlugins/ply/plyfile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/osgPlugins/ply/plyfile.cpp b/src/osgPlugins/ply/plyfile.cpp index c59caa95d..5754464c3 100644 --- a/src/osgPlugins/ply/plyfile.cpp +++ b/src/osgPlugins/ply/plyfile.cpp @@ -1916,10 +1916,9 @@ char **get_words(FILE *fp, int *nwords, char **orig_line) *ptr = ' '; *ptr2 = ' '; } - else if (*ptr == '\n') { + else if (*ptr == '\n' || *ptr == '\r') { *ptr = ' '; *ptr2 = '\0'; - break; } }