Commit 0a0738b0 authored by Lamarque Souza's avatar Lamarque Souza

Merge branch 'master' into lvsouza/another_attempt_to_fix_crash_in_debug_mode

parents 8a0b7cbe a32257df
......@@ -337,9 +337,7 @@ KoFillConfigWidget::~KoFillConfigWidget()
void KoFillConfigWidget::activate()
{
KIS_SAFE_ASSERT_RECOVER_RETURN(!d->deactivationLocks.empty());
d->deactivationLocks.clear();
if (!d->noSelectionTrackingMode) {
d->shapeChangedCompressor.start();
} else {
......@@ -352,8 +350,7 @@ void KoFillConfigWidget::activate()
void KoFillConfigWidget::deactivate()
{
emit sigInternalRecoverColorInResourceManager();
KIS_SAFE_ASSERT_RECOVER_RETURN(d->deactivationLocks.empty());
d->deactivationLocks.clear();
d->deactivationLocks.push_back(KisAcyclicSignalConnector::Blocker(d->shapeChangedAcyclicConnector));
d->deactivationLocks.push_back(KisAcyclicSignalConnector::Blocker(d->resourceManagerAcyclicConnector));
}
......
......@@ -459,12 +459,9 @@ void KoStrokeConfigWidget::updateMarkers(const QList<KoMarker*> &markers)
void KoStrokeConfigWidget::activate()
{
KIS_SAFE_ASSERT_RECOVER_RETURN(!d->deactivationLocks.empty());
d->deactivationLocks.clear();
d->fillConfigWidget->activate();
if (!d->noSelectionTrackingMode) {
// selectionChanged();
d->selectionChangedCompressor.start();
} else {
loadCurrentStrokeFillFromResourceServer();
......@@ -473,8 +470,7 @@ void KoStrokeConfigWidget::activate()
void KoStrokeConfigWidget::deactivate()
{
KIS_SAFE_ASSERT_RECOVER_RETURN(d->deactivationLocks.empty());
d->deactivationLocks.clear();
d->deactivationLocks.push_back(KisAcyclicSignalConnector::Blocker(d->shapeChangedAcyclicConnector));
d->deactivationLocks.push_back(KisAcyclicSignalConnector::Blocker(d->resourceManagerAcyclicConnector));
d->fillConfigWidget->deactivate();
......
......@@ -292,7 +292,7 @@ void KisTransformUtils::transformDevice(const ToolTransformArgs &config,
worker.prepareTransform();
worker.setTransformedCage(config.transfPoints());
worker.run();
} else if (config.mode() == ToolTransformArgs::LIQUIFY) {
} else if (config.mode() == ToolTransformArgs::LIQUIFY && config.liquifyWorker()) {
KoUpdaterPtr updater = helper->updater();
//FIXME:
Q_UNUSED(updater);
......
......@@ -249,7 +249,8 @@ void TransformStrokeStrategy::doStrokeCallback(KisStrokeJobData *data)
}
emit sigPreviewDeviceReady(previewDevice);
} else if(td) {
}
else if (td) {
if (td->destination == TransformData::PAINT_DEVICE) {
QRect oldExtent = td->node->extent();
KisPaintDeviceSP device = td->node->paintDevice();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment