From 8b1225c24021940c66eb3a229d71b49ac1ed56fb Mon Sep 17 00:00:00 2001
From: trisyoungs <trisyoungs@googlemail.com>
Date: Wed, 25 Jul 2012 13:45:19 +0000
Subject: [PATCH] Fixed - When not using pixel buffers, after rendering an
 offscreen icon/image the drawing target was not correctly reset to the
 screen.

---
 CMakeLists.txt        | 2 +-
 TODO                  | 2 ++
 aten.kdev4            | 4 ++--
 aten.spec             | 2 +-
 configure.ac          | 2 +-
 extra/aten.dsc        | 4 ++--
 src/main/version.h    | 4 ++--
 src/render/engine.cpp | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index beccf9699..4df21a8fd 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(Aten)
 set(DESCRIPTION "Aten - Atomic configuration builder and editor")
 set(AUTHOR "Tristan Youngs")
 set(VERSION_MAJOR "1")
-set(VERSION_MINOR "829")
+set(VERSION_MINOR "830")
 set(VERSION_PATCH "1")
 
 set(CMAKE_BUILD_TYPE "Release")
diff --git a/TODO b/TODO
index 21ab2246a..763dd085f 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
 <h1>Known Bugs</h1>
 
 <ul>
+<li>Creating expression for trajectory frame causes crash?</li>
+<li>Normals for plotCube() are wrong.</li>
 <li>When manipulating an atom selection, undoing afterwards does not undo Fold</li>
 <li>UnitCell:mim(Atom*,Vec3) returns incorrect position - where is it used?</li>
 <li>Glyph list not updated on model load.</li>
diff --git a/aten.kdev4 b/aten.kdev4
index 52b683bec..fcd5364c1 100644
--- a/aten.kdev4
+++ b/aten.kdev4
@@ -1,3 +1,3 @@
 [Project]
-Manager=KDevCMakeManager
-Name=aten-pixmap
+Manager=KDevCustomMakeManager
+Name=aten
diff --git a/aten.spec b/aten.spec
index bcfed077c..2992808ab 100644
--- a/aten.spec
+++ b/aten.spec
@@ -4,7 +4,7 @@
 # Name, brief description, and version 
 Summary: Aten - Atomic configuration builder and editor
 Name: %{shortname}
-Version: 1.829
+Version: 1.830
 Release: 1
 License: GPL
 %define fullname %{name}-%{version}
diff --git a/configure.ac b/configure.ac
index ff109af26..d6bfbeb65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 AC_PREREQ(2.60)
 
 # Set program name, version, bug-address and source directory
-m4_define([ATEN_VERSION],[1.829])
+m4_define([ATEN_VERSION],[1.830])
 AC_INIT(aten,ATEN_VERSION,tris@projectaten.net)
 AC_CONFIG_SRCDIR([src/main.cpp])
 
diff --git a/extra/aten.dsc b/extra/aten.dsc
index 6ee30a34c..a0048d792 100644
--- a/extra/aten.dsc
+++ b/extra/aten.dsc
@@ -1,9 +1,9 @@
 Format: 1.0
 Source: aten
-Version: 1.829
+Version: 1.830
 Binary: aten
 Maintainer: Tristan Youngs <tris@projectaten.net>
 Architecture: any
 Build-Depends: debhelper (>= 4.1.16), libqt4-dev | libqt4-core, libqt4-opengl-dev, libreadline5-dev | libreadline-dev, libgl1-mesa-dev, pkgconfig | pkg-config, libncurses5
 Files: 
- 4aec60597e330aeae02c1af550c6deab 4293031 aten-1.829.tar.gz
+ 4aec60597e330aeae02c1af550c6deab 4293031 aten-1.830.tar.gz
diff --git a/src/main/version.h b/src/main/version.h
index 359681fe2..a9fc31006 100644
--- a/src/main/version.h
+++ b/src/main/version.h
@@ -22,8 +22,8 @@
 #ifndef ATEN_VERSION_H
 #define ATEN_VERSION_H
 
-#define ATENVERSION "1.829"
-#define ATENREVISION "1829"
+#define ATENVERSION "1.830"
+#define ATENREVISION "1830"
 #define ATENDATE "Thu 28 Jun - 13:36"
 #define ATENURL "http://aten.googlecode.com/svn/trunk"
 
diff --git a/src/render/engine.cpp b/src/render/engine.cpp
index a6fa82f2a..6367aae08 100644
--- a/src/render/engine.cpp
+++ b/src/render/engine.cpp
@@ -771,7 +771,7 @@ QPixmap RenderEngine::renderModelIcon(Model *source)
 		// Generate offscreen bitmap (a temporary context will be created)
 		gui.mainCanvas()->setRenderType(OffscreenModel, source);
 		QPixmap pixmap = gui.mainCanvas()->renderPixmap(100,100);
-		gui.mainCanvas()->setRenderType(OffscreenModel);
+		gui.mainCanvas()->setRenderType(OnscreenModel);
 		
 		// Flag for rendering list regeneration again
 		clearListsFlag_ = TRUE;