Merge branch 'clh' into liuyang

mrDarker

7 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/CDoubleGlass.cpp

@@ -1,5 +1,7 @@
#include "stdafx.h"
#include "Servo.h"
#include "CDoubleGlass.h"
#include "CGlassPool.h"


namespace SERVO {
@@ -72,11 +74,11 @@
         ULONGLONG ulGlass1;
         ar >> ulGlass1;
         if (ulGlass1 != 0) {
            m_pGlass1 = new CGlass();
            m_pGlass1 = theApp.m_model.m_glassPool.allocaGlass();
            m_pGlass1->serialize(ar);
         }
         if (ulGlass1 != 0) {
            m_pGlass2 = new CGlass();
            m_pGlass2 = theApp.m_model.m_glassPool.allocaGlass();
            m_pGlass2->serialize(ar);
         }