From 115e3910e3ad53270dbb30ab52454a4aa73213fb Mon Sep 17 00:00:00 2001
From: DrSlony <entertheyoni@gmail.com>
Date: Sat, 2 Jun 2012 22:39:57 +0100
Subject: [PATCH] Absolute paste of rotation value when using partial paste,
 issue 1386 committed on behalf of Dr.Hombre

---
 rtengine/procparams.cc | 7 -------
 rtgui/paramsedited.cc  | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index d246d6672..180dd4d65 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -1392,13 +1392,6 @@ void PartialProfile::clearGeneral () {
 
 void PartialProfile::applyTo(ProcParams *destParams) const {
     if (destParams && pparams && pedited) {
-        if (pedited->coarse.rotate)
-            destParams->coarse.rotate = 0;
-        if (pedited->coarse.hflip)
-            destParams->coarse.hflip = false;
-        if (pedited->coarse.vflip)
-            destParams->coarse.vflip = false;
-
         pedited->combine(*destParams, *pparams, true);
     }
 }
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index ffad8e753..9461b0a8e 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -520,9 +520,9 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
 	if (crop.ratio)		    				toEdit.crop.ratio 	    = mods.crop.ratio;
 	if (crop.orientation)					toEdit.crop.orientation = mods.crop.orientation;
 	if (crop.guide)		    				toEdit.crop.guide 	    = mods.crop.guide;
-	if (coarse.rotate)						toEdit.coarse.rotate 	= (toEdit.coarse.rotate + mods.coarse.rotate) % 360;
-	if (coarse.hflip)						toEdit.coarse.hflip 	= mods.coarse.hflip ? !toEdit.coarse.hflip : toEdit.coarse.hflip;
-	if (coarse.vflip)						toEdit.coarse.vflip 	= mods.coarse.vflip ? !toEdit.coarse.vflip : toEdit.coarse.vflip;
+	if (coarse.rotate)						toEdit.coarse.rotate 	= mods.coarse.rotate;
+	if (coarse.hflip)						toEdit.coarse.hflip 	= mods.coarse.hflip;
+	if (coarse.vflip)						toEdit.coarse.vflip 	= mods.coarse.vflip;
 	if (commonTrans.autofill)				toEdit.commonTrans.autofill		= mods.commonTrans.autofill;
 	if (rotate.degree)						toEdit.rotate.degree 			= dontforceSet && options.baBehav[ADDSET_ROTATE_DEGREE] ? toEdit.rotate.degree + mods.rotate.degree : mods.rotate.degree;
 	if (distortion.amount)					toEdit.distortion.amount 		= dontforceSet && options.baBehav[ADDSET_DIST_AMOUNT] ? toEdit.distortion.amount + mods.distortion.amount : mods.distortion.amount;