From 8d437e955d1223ce622343ac7da90b1ad6fab954 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期四, 05 六月 2025 09:13:09 +0800 Subject: [PATCH] Merge branch 'master' into liuyang --- SourceCode/Bond/Servo/CSlot.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/CSlot.h b/SourceCode/Bond/Servo/CSlot.h index 1d783d2..76461d8 100644 --- a/SourceCode/Bond/Servo/CSlot.h +++ b/SourceCode/Bond/Servo/CSlot.h @@ -27,6 +27,7 @@ void setName(const char* pszName); BOOL isEmpty(); CContext* getContext(); + CContext* getTempContext(); void setContext(CContext* pContext); void serialize(CArchive& ar); @@ -40,6 +41,7 @@ MaterialsType m_materialsType; std::string m_strName; CContext* m_pContext; + CContext* m_pTempContext; BOOL m_bEnable; BOOL m_bLock; }; -- Gitblit v1.9.3