Merge pull request #5752 from sebastianha/master
Error compiling on Linux
This commit is contained in:
commit
f050bf7676
1 changed files with 2 additions and 2 deletions
|
@ -201,9 +201,9 @@ void ModelNode::UpdateIcons()
|
||||||
{
|
{
|
||||||
// update icons for the colors, if any exists
|
// update icons for the colors, if any exists
|
||||||
if (!m_old_color.IsEmpty())
|
if (!m_old_color.IsEmpty())
|
||||||
m_old_color_bmp = get_bitmap(m_toggle ? m_old_color : grey);
|
m_old_color_bmp = get_bitmap(m_toggle ? m_old_color : grey.c_str());
|
||||||
if (!m_new_color.IsEmpty())
|
if (!m_new_color.IsEmpty())
|
||||||
m_new_color_bmp = get_bitmap(m_toggle ? m_new_color : grey);
|
m_new_color_bmp = get_bitmap(m_toggle ? m_new_color : grey.c_str());
|
||||||
|
|
||||||
// update main icon, if any exists
|
// update main icon, if any exists
|
||||||
if (m_icon_name.empty())
|
if (m_icon_name.empty())
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue