git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inflict Qt4 upon the codebase
[ipdf/code.git]
/
src
/
view.cpp
diff --git
a/src/view.cpp
b/src/view.cpp
index
e0efce9
..
a953579
100644
(file)
--- a/
src/view.cpp
+++ b/
src/view.cpp
@@
-3,6
+3,10
@@
#include "screen.h"
#include "gl_core44.h"
#include "screen.h"
#include "gl_core44.h"
+#ifndef CONTROLPANEL_DISABLED
+ #include "controlpanel.h"
+#endif //CONTROLPANEL_DISABLED
+
using namespace IPDF;
using namespace std;
using namespace IPDF;
using namespace std;
@@
-239,6
+243,11
@@
void View::Render(int width, int height)
m_cached_display.Blit(); // blit FrameBuffer to screen
m_buffer_dirty = false;
glPopDebugGroup();
m_cached_display.Blit(); // blit FrameBuffer to screen
m_buffer_dirty = false;
glPopDebugGroup();
+
+#ifndef CONTROLPANEL_DISABLED
+ ControlPanel::Update();
+#endif //CONTROLPANEL_DISABLED
+
}
#ifndef QUADTREE_DISABLED
}
#ifndef QUADTREE_DISABLED
UCC
git Repository :: git.ucc.asn.au