Changeset View
Changeset View
Standalone View
Standalone View
libs/image/kis_layer_utils.cpp
Show First 20 Lines • Show All 947 Lines • ▼ Show 20 Line(s) | 938 | if (layer->visible() && prevLayer->visible()) { | |||
---|---|---|---|---|---|
948 | applicator.applyCommand(new FillSelectionMasks(info)); | 948 | applicator.applyCommand(new FillSelectionMasks(info)); | ||
949 | applicator.applyCommand(new CreateMergedLayer(info), KisStrokeJobData::BARRIER); | 949 | applicator.applyCommand(new CreateMergedLayer(info), KisStrokeJobData::BARRIER); | ||
950 | 950 | | |||
951 | // NOTE: shape layer may have emitted spontaneous jobs during layer creation, | 951 | // NOTE: shape layer may have emitted spontaneous jobs during layer creation, | ||
952 | // wait for them to complete! | 952 | // wait for them to complete! | ||
953 | applicator.applyCommand(new RefreshDelayedUpdateLayers(info), KisStrokeJobData::BARRIER); | 953 | applicator.applyCommand(new RefreshDelayedUpdateLayers(info), KisStrokeJobData::BARRIER); | ||
954 | applicator.applyCommand(new KUndo2Command(), KisStrokeJobData::BARRIER); | 954 | applicator.applyCommand(new KUndo2Command(), KisStrokeJobData::BARRIER); | ||
955 | 955 | | |||
956 | // in two-layer mode we disable pass trhough only when the destination layer | 956 | // in two-layer mode we disable pass through only when the destination layer | ||
957 | // is not a group layer | 957 | // is not a group layer | ||
958 | applicator.applyCommand(new DisablePassThroughForHeadsOnly(info, true)); | 958 | applicator.applyCommand(new DisablePassThroughForHeadsOnly(info, true)); | ||
959 | applicator.applyCommand(new KUndo2Command(), KisStrokeJobData::BARRIER); | 959 | applicator.applyCommand(new KUndo2Command(), KisStrokeJobData::BARRIER); | ||
960 | 960 | | |||
961 | if (info->frames.size() > 0) { | 961 | if (info->frames.size() > 0) { | ||
962 | foreach (int frame, info->frames) { | 962 | foreach (int frame, info->frames) { | ||
963 | applicator.applyCommand(new SwitchFrameCommand(info->image, frame, false, info->storage)); | 963 | applicator.applyCommand(new SwitchFrameCommand(info->image, frame, false, info->storage)); | ||
964 | 964 | | |||
▲ Show 20 Lines • Show All 527 Lines • Show Last 20 Lines |