Skip to content

C
core
Kaydet (Commit) 86c55c35 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Fix merge glitch (?) 

Change-Id: I4cc5d49f8df63c46e50f2bfd64de7bd257ff9d76
üst cf53e0ea
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cppcanvas/source/mtfrenderer/implrenderer.cxx
Dosyayı görüntüle @ 86c55c35
...@@ -1469,7 +1469,7 @@ namespace cppcanvas ...@@ -1469,7 +1469,7 @@ namespace cppcanvas
// #120994# Do switch on/off LineColor, even when a overriding one is set // #120994# Do switch on/off LineColor, even when a overriding one is set
bool bSetting(static_cast<MetaLineColorAction*>(pCurrAct)->IsSetting()); bool bSetting(static_cast<MetaLineColorAction*>(pCurrAct)->IsSetting());
getState( rStates ).isLineColorSet = bSetting; rStates.getState().isLineColorSet = bSetting;
} }
break; break;
...@@ -1486,7 +1486,7 @@ namespace cppcanvas ...@@ -1486,7 +1486,7 @@ namespace cppcanvas
// #120994# Do switch on/off FillColor, even when a overriding one is set // #120994# Do switch on/off FillColor, even when a overriding one is set
bool bSetting(static_cast<MetaFillColorAction*>(pCurrAct)->IsSetting()); bool bSetting(static_cast<MetaFillColorAction*>(pCurrAct)->IsSetting());
getState( rStates ).isFillColorSet = bSetting; rStates.getState().isFillColorSet = bSetting;
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment