Fixed enum string parsing bug that would ignore parsing additional fields in a component after it encountered the first enum.

This commit is contained in:
2016-01-21 12:24:08 +01:00
parent f1345419b6
commit 0183e1bdb7
2 changed files with 4 additions and 4 deletions
@@ -3,9 +3,6 @@
<Components> <Components>
<c:Transform/> <c:Transform/>
<c:UniformScale>
<Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
</c:UniformScale>
</Components> </Components>
<Children> <Children>
@@ -15,6 +12,7 @@
<Type> <Type>
<Rotate/> <Rotate/>
</Type> </Type>
<Axis X="1" Y="0" Z="0"/>
</c:EditorWidget> </c:EditorWidget>
<c:Model> <c:Model>
<Resource>Models/RotationWidgetX.obj</Resource> <Resource>Models/RotationWidgetX.obj</Resource>
@@ -29,6 +27,7 @@
<Type> <Type>
<Rotate/> <Rotate/>
</Type> </Type>
<Axis X="0" Y="1" Z="0"/>
</c:EditorWidget> </c:EditorWidget>
<c:Model> <c:Model>
<Resource>Models/RotationWidgetY.obj</Resource> <Resource>Models/RotationWidgetY.obj</Resource>
@@ -43,6 +42,7 @@
<Type> <Type>
<Rotate/> <Rotate/>
</Type> </Type>
<Axis X="0" Y="0" Z="1"/>
</c:EditorWidget> </c:EditorWidget>
<c:Model> <c:Model>
<Resource>Models/RotationWidgetZ.obj</Resource> <Resource>Models/RotationWidgetZ.obj</Resource>
+1 -1
View File
@@ -171,7 +171,7 @@ void EntityFileSAXHandler::endElement(const XMLCh* const _uri, const XMLCh* cons
//} //}
} }
if (m_StateStack.top() == State::ComponentField) { if (m_StateStack.top() == State::ComponentField && name == m_CurrentField) {
m_StateStack.pop(); m_StateStack.pop();
onEndComponentField(name); onEndComponentField(name);
return; return;