[commit] r1291 - trunk/SDK/DecoratorLib

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Apr 27 12:43:54 2011
New Revision: 1291

Log:
Fix an ASSERT, properly set m_spMetaFCO

Modified:
   trunk/SDK/DecoratorLib/BitmapPart.cpp
   trunk/SDK/DecoratorLib/PartBase.cpp

Modified: trunk/SDK/DecoratorLib/BitmapPart.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/BitmapPart.cpp	Wed Apr 27 11:18:28 2011	(r1290)
+++ trunk/SDK/DecoratorLib/BitmapPart.cpp	Wed Apr 27 12:43:54 2011	(r1291)
@@ -77,7 +77,7 @@
 	if (it != preferences.end())
 		m_crBorder = it->second.uValue.crValue;
 	else
-		getFacilities().getPreference(pFCO, PREF_BORDERCOLOR, m_crBorder);
+		getFacilities().getPreference(pFCO, spMetaFCO, PREF_BORDERCOLOR, m_crBorder);
 
 	// Check if we should create masked bitmap
 	bool bMasked = false;

Modified: trunk/SDK/DecoratorLib/PartBase.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/PartBase.cpp	Wed Apr 27 11:18:28 2011	(r1290)
+++ trunk/SDK/DecoratorLib/PartBase.cpp	Wed Apr 27 12:43:54 2011	(r1291)
@@ -54,6 +54,7 @@
 		COMTHROW(spRole->get_Kind(&spMetaFCO));
 
 		COMTHROW(spMetaFCO->get_ObjType(&m_eType));
+		m_spMetaFCO = spMetaFCO;
 	}
 
 	m_bHasViolation	= false;