Merge branch 'master' into zlib-nobuild

code/AssetLib/Ply/PlyParser.cpp

@@ -308,8 +308,8 @@ bool PLY::Element::ParseElement(IOStreamBuffer<char> &streamBuffer, std::vector<
         streamBuffer.getNextLine(buffer);
         pCur = (char *)&buffer[0];
 
-        // skip all comments
-        PLY::DOM::SkipComments(buffer);
+        // skip all comments and go to next line
+        if (PLY::DOM::SkipComments(buffer)) continue;
 
         PLY::Property prop;
         if (!PLY::Property::ParseProperty(buffer, &prop))

test/models/PLY/issue623.ply

@@ -2,6 +2,7 @@ ply
 format ascii 1.0
 comment Created by Blender 2.77 (sub 0) - www.blender.org, source file: ''
 element vertex 24
+comment Manually added comment line to fix issue #4866
 property float x
 property float y
 property float z