Merge with 'Beep6581/dev'
This commit is contained in:
@@ -1181,8 +1181,8 @@ void ToolPanelCoordinator::profileChange(
|
||||
|
||||
// Reset IPTC values when switching procparams from the History
|
||||
if (event == rtengine::EvHistoryBrowsed) {
|
||||
mergedParams->iptc.clear();
|
||||
mergedParams->exif.clear();
|
||||
mergedParams->metadata.iptc.clear();
|
||||
mergedParams->metadata.exif.clear();
|
||||
}
|
||||
|
||||
// And apply the partial profile nparams to mergedParams
|
||||
@@ -1906,6 +1906,12 @@ bool ToolPanelCoordinator::getFilmNegativeSpot(rtengine::Coord spot, int spotSiz
|
||||
return ipc && ipc->getFilmNegativeSpot(spot.x, spot.y, spotSize, refInput, refOutput);
|
||||
}
|
||||
|
||||
|
||||
void ToolPanelCoordinator::setProgressListener(rtengine::ProgressListener *pl)
|
||||
{
|
||||
metadata->setProgressListener(pl);
|
||||
}
|
||||
|
||||
FoldableToolPanel *ToolPanelCoordinator::getFoldableToolPanel(Tool tool) const
|
||||
{
|
||||
switch (tool) {
|
||||
|
Reference in New Issue
Block a user