Resolved merge conflict.

2013-02-20 22:20:37 -08:00 · 2013-02-20 22:20:37 -08:00 · bbfc599684
commit bbfc599684
parent 195fd6913d c698457907
1 changed files with 2 additions and 2 deletions
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@ -157,7 +157,8 @@ namespace bgfx
 	struct RendererContext
 	{
 		RendererContext()
-			: m_capture(NULL)
+			: m_rtMsaa(false)
+			, m_capture(NULL)
 			, m_captureSize(0)
 			, m_maxAnisotropy(0.0f)
 			, m_maxMsaa(0)
@ -167,7 +168,6 @@ namespace bgfx
 			, m_flip(false)
 			, m_postSwapBuffers(NULL)
 			, m_hash( (BX_PLATFORM_WINDOWS<<1) | BX_ARCH_64BIT)
-			, m_rtMsaa(false)
 			, m_backBufferFbo(0)
 		{
 			m_rt.idx = invalidHandle;