From: David Gow <david@ingeniumdigital.com>
Date: Thu, 17 Apr 2014 02:52:45 +0000 (+0800)
Subject: Merge branch 'master' of git.ucc.asn.au:ipdf/code
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=67fb91aae1fc5315f462d6b5818806f154e9e687;p=ipdf%2Fcode.git

Merge branch 'master' of git.ucc.asn.au:ipdf/code
---

67fb91aae1fc5315f462d6b5818806f154e9e687
diff --cc src/view.cpp
index 969bbb3,b8b8ab6..3c6e2f5
--- a/src/view.cpp
+++ b/src/view.cpp
@@@ -67,9 -94,10 +94,10 @@@ void View::Render(
  	}
  	glEnd();
  
+ 	
  	for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
  	{
 -		if (m_document.m_objects.types[id] == RECT_OUTLINE)
 +		if (m_document.m_objects.types[id] != RECT_OUTLINE)
  			continue;
  		Rect obj_bounds = m_document.m_objects.bounds[id];
  		glBegin(GL_LINE_LOOP);