mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 13:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-render-bug' into beta

Browse Source
This commit is contained in:
David Capello 2016-12-07 17:06:23 -03:00
commit a528a1e7b4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/render/render.cpp
View File

@ -490,6 +490,7 @@ Render::Render()
, m_bgType(BgType::TRANSPARENT)
, m_bgCheckedSize(16, 16)
, m_globalOpacity(255)
, m_selectedLayerForOpacity(nullptr)
, m_selectedLayer(nullptr)
, m_selectedFrame(-1)
, m_previewImage(nullptr)
@ -543,7 +544,7 @@ void Render::setBgCheckedSize(const gfx::Size& size)
void Render::setSelectedLayer(const Layer* layer)
{
m_selectedLayer = layer;
m_selectedLayerForOpacity = layer;
}
void Render::setPreviewImage(const Layer* layer,
@ -880,7 +881,7 @@ void Render::renderLayer(
if (!layer->isVisible())
return;
if (m_selectedLayer == layer)
if (m_selectedLayerForOpacity == layer)
isSelected = true;
gfx::Rect extraArea;

1
src/render/render.h
View File

@ -239,6 +239,7 @@ namespace render {
color_t m_bgColor2;
gfx::Size m_bgCheckedSize;
int m_globalOpacity;
const Layer* m_selectedLayerForOpacity;
const Layer* m_selectedLayer;
frame_t m_selectedFrame;
const Image* m_previewImage;