3 files changed, 10 insertions, 1 deletions

diff --git a/src/ui/paint.c b/src/ui/paint.c
index b92be27e..439bdd37 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -41,6 +41,7 @@ void init_Paint(iPaint *d) {
     d->dst       = get_Window();
     d->setTarget = NULL;
     d->oldTarget = NULL;
+    d->oldOrigin = zero_I2();
     d->alpha     = 255;
 }
 
@@ -48,6 +49,8 @@ void beginTarget_Paint(iPaint *d, SDL_Texture *target) {
     SDL_Renderer *rend = renderer_Paint_(d);
     if (!d->setTarget) {
         d->oldTarget = SDL_GetRenderTarget(rend);
+        d->oldOrigin = origin_Paint;
+        origin_Paint = zero_I2();
         SDL_SetRenderTarget(rend, target);
         d->setTarget = target;
     }
@@ -59,8 +62,10 @@ void beginTarget_Paint(iPaint *d, SDL_Texture *target) {
 void endTarget_Paint(iPaint *d) {
     if (d->setTarget) {
         SDL_SetRenderTarget(renderer_Paint_(d), d->oldTarget);
+        origin_Paint = d->oldOrigin;
+        d->oldOrigin = zero_I2();
         d->oldTarget = NULL;
-        d->setTarget = NULL;
+        d->setTarget = NULL;        
     }
 }
 
diff --git a/src/ui/paint.h b/src/ui/paint.h
index e894b62f..dfc9260d 100644
--- a/src/ui/paint.h
+++ b/src/ui/paint.h
@@ -33,6 +33,7 @@ struct Impl_Paint {
     iWindow *    dst;
     SDL_Texture *setTarget;
     SDL_Texture *oldTarget;
+    iInt2        oldOrigin;
     uint8_t      alpha;
 };
 
diff --git a/src/ui/visbuf.c b/src/ui/visbuf.c
index 8f7a4c46..0097b12a 100644
--- a/src/ui/visbuf.c
+++ b/src/ui/visbuf.c
@@ -21,6 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "visbuf.h"
+#include "paint.h"
 #include "window.h"
 #include "util.h"
 
@@ -224,6 +225,8 @@ void draw_VisBuf(const iVisBuf *d, const iInt2 topLeft, const iRangei yClipBound
             continue; /* Outside the clipping area. */
 #endif
         }
+        dst.x += origin_Paint.x;
+        dst.y += origin_Paint.y;
 #if defined (DEBUG_SCALE)
         dst.w *= DEBUG_SCALE;
         dst.h *= DEBUG_SCALE;