Merge branch 'master' into zlib-nobuild
commit
213b536282
|
@ -308,8 +308,8 @@ bool PLY::Element::ParseElement(IOStreamBuffer<char> &streamBuffer, std::vector<
|
||||||
streamBuffer.getNextLine(buffer);
|
streamBuffer.getNextLine(buffer);
|
||||||
pCur = (char *)&buffer[0];
|
pCur = (char *)&buffer[0];
|
||||||
|
|
||||||
// skip all comments
|
// skip all comments and go to next line
|
||||||
PLY::DOM::SkipComments(buffer);
|
if (PLY::DOM::SkipComments(buffer)) continue;
|
||||||
|
|
||||||
PLY::Property prop;
|
PLY::Property prop;
|
||||||
if (!PLY::Property::ParseProperty(buffer, &prop))
|
if (!PLY::Property::ParseProperty(buffer, &prop))
|
||||||
|
|
|
@ -2,6 +2,7 @@ ply
|
||||||
format ascii 1.0
|
format ascii 1.0
|
||||||
comment Created by Blender 2.77 (sub 0) - www.blender.org, source file: ''
|
comment Created by Blender 2.77 (sub 0) - www.blender.org, source file: ''
|
||||||
element vertex 24
|
element vertex 24
|
||||||
|
comment Manually added comment line to fix issue #4866
|
||||||
property float x
|
property float x
|
||||||
property float y
|
property float y
|
||||||
property float z
|
property float z
|
||||||
|
|
Loading…
Reference in New Issue