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

Fix --ignore-layer: doesn't activate all hidden layers (fix #1264)

Browse Source
This commit is contained in:
David Capello 2016-12-06 11:06:08 -03:00
parent 54ef2eeb66
commit 2e47bd1fbc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/cli/cli_processor.cpp
View File

@ -81,9 +81,6 @@ bool filter_layer(const Layer* layer,
const std::vector<std::string>& filters,
const bool result)
{
if (filters.empty())
return true;
for (const auto& filter : filters) {
if (layer->name() == filter ||
match_path(filter, layer_path, !result))
@ -99,9 +96,15 @@ void filter_layers(const LayerList& layers,
for (Layer* layer : layers) {
auto layer_path = get_layer_path(layer);
if (filter_layer(layer, layer_path, cof.includeLayers, true) &&
filter_layer(layer, layer_path, cof.excludeLayers, false))
filteredLayers.insert(layer);
if ((cof.includeLayers.empty() && !layer->isVisibleHierarchy()) ||
(!cof.includeLayers.empty() && !filter_layer(layer, layer_path, cof.includeLayers, true)))
continue;
if (!cof.excludeLayers.empty() &&
!filter_layer(layer, layer_path, cof.excludeLayers, false))
continue;
filteredLayers.insert(layer);
}
}