From 1c0ac1c7924efb8a2cb6962d3eda4126533a5ac8 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 14 七月 2025 16:55:55 +0800
Subject: [PATCH] 合并代码（代提交）

---
 ENRIT/View/FrameImg.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ENRIT/View/FrameImg.h b/ENRIT/View/FrameImg.h
index 5070575..0937d48 100644
--- a/ENRIT/View/FrameImg.h
+++ b/ENRIT/View/FrameImg.h
@@ -157,7 +157,6 @@
 	SIZE					m_szMark;
 	MANUAL_MEASURE			m_ManualMeausre;
 	CPoint					m_ptMouseSaved;		// Profile Save 扁瓷矫 荤侩
-
 	IViewInterface2Parent	*m_pI2M;
 	bitset<MAX_DISPLAY_MODE>		m_bitModeDisplay;	// 拳搁 葛靛 bit
 	CRect					m_rcROI;			// 泅力 焊咯瘤绊 乐绰 康开
@@ -169,7 +168,7 @@
 	
 	CGlass_Data				*m_pGlassData;
 	CHardwareSettings		*m_pHardware;
-	CGlassRecipe		*m_pRecipe;
+	CGlassRecipe			*m_pRecipe;
 //	CRecipe					m_RecipeManager;	
 
 public:	
@@ -182,6 +181,7 @@
 
 	int				m_nModeTrackerVCR;
 	CPoint			m_ptOldMouseVCR;	
+	int				m_nBrushGray;
 };
 
 

--
Gitblit v1.9.3