mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use the ColorBar bg color when Background is visible in Flatten

Browse Source
This commit is contained in:
David Capello 2015-07-27 08:34:05 -03:00
parent 64ae80f0d3
commit 0f38a7dace
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/cmd/flatten_layers.cpp
View File

@ -45,15 +45,22 @@ void FlattenLayers::onExecute()
// If there aren't a background layer we must to create the background. // If there aren't a background layer we must to create the background.
LayerImage* background = sprite->backgroundLayer(); LayerImage* background = sprite->backgroundLayer();
bool created = false;
if (!background) { if (!background) {
background = new LayerImage(sprite); background = new LayerImage(sprite);
executeAndAdd(new cmd::AddLayer(sprite->folder(), background, nullptr)); executeAndAdd(new cmd::AddLayer(sprite->folder(), background, nullptr));
executeAndAdd(new cmd::ConfigureBackground(background)); executeAndAdd(new cmd::ConfigureBackground(background));
created = true;
} }
color_t bgcolor;
if (created || !background->isVisible())
bgcolor = doc->bgColor(background); // Use color bar background color
else
bgcolor = sprite->transparentColor();
render::Render render; render::Render render;
render.setBgType(render::BgType::NONE); render.setBgType(render::BgType::NONE);
color_t bgcolor = doc->bgColor(background);
// Copy all frames to the background. // Copy all frames to the background.
for (frame_t frame(0); frame<sprite->totalFrames(); ++frame) { for (frame_t frame(0); frame<sprite->totalFrames(); ++frame) {