From 051766d1d54968f51ceeeb420cb4d3779507ed6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Sun, 17 Nov 2013 23:33:46 +0100
Subject: [PATCH] Fixed top-down render preview in render form

---
 src/definition/Scenery.cpp           | 14 ++++++++++++++
 src/definition/Scenery.h             |  2 ++
 src/interface/desktop/formrender.cpp |  4 +---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/definition/Scenery.cpp b/src/definition/Scenery.cpp
index cbbf7f5..89e97c4 100644
--- a/src/definition/Scenery.cpp
+++ b/src/definition/Scenery.cpp
@@ -38,6 +38,20 @@ void Scenery::load(PackStream* stream)
     validate();
 }
 
+void Scenery::copy(BaseDefinition *destination_) const
+{
+    Scenery* destination = (Scenery*)destination_;
+
+    atmosphere->copy(destination->atmosphere);
+    camera->copy(destination->camera);
+    clouds->copy(destination->clouds);
+    terrain->copy(destination->terrain);
+    textures->copy(destination->textures);
+    water->copy(destination->water);
+
+    destination->validate();
+}
+
 void Scenery::validate()
 {
     BaseDefinition::validate();
diff --git a/src/definition/Scenery.h b/src/definition/Scenery.h
index 462216b..caa9f83 100644
--- a/src/definition/Scenery.h
+++ b/src/definition/Scenery.h
@@ -22,6 +22,8 @@ public:
     virtual void load(PackStream* stream) override;
 
     virtual void validate() override;
+    virtual void copy(BaseDefinition *destination) const override;
+
     virtual Scenery* getScenery() override;
 
     void autoPreset(int seed);
diff --git a/src/interface/desktop/formrender.cpp b/src/interface/desktop/formrender.cpp
index 97c1ca3..49d92b4 100644
--- a/src/interface/desktop/formrender.cpp
+++ b/src/interface/desktop/formrender.cpp
@@ -70,8 +70,6 @@ protected:
             CloudsRendererClass.bind(_renderer, _no_clouds);
         }
 
-        _renderer->prepare();
-
         _renderer->atmosphere->applyAerialPerspective = _applyAerialPerspective;
     }
 
@@ -85,7 +83,7 @@ protected:
     }
 
 private:
-    Renderer* _renderer;
+    SoftwareRenderer* _renderer;
     bool _clouds_enabled;
     CloudsDefinition* _no_clouds;