Merge branch 'master' into releaseCandidate_O

dcwhite · dcwhite · commit 05bcccf933df · 2015-01-23T16:43:53.000-07:00
diff --git a/src/Interface/Modules/Render/ES/systems/RenderTransColorMapSys.cc b/src/Interface/Modules/Render/ES/systems/RenderTransColorMapSys.cc
@@ -423,6 +423,8 @@ class RenderColorMapSysTrans :
       }
     }
 
+    iboMan.front().instance->removeInMemoryIBO(iboID);
+
     if (depthMask)
     {
       GL(glDepthMask(GL_TRUE));

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,8 @@ class RenderColorMapSysTrans :`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`
	`426`	`+ iboMan.front().instance->removeInMemoryIBO(iboID);`
	`427`	`+`
`426`	`428`	`if (depthMask)`
`427`	`429`	`{`
`428`	`430`	`GL(glDepthMask(GL_TRUE));`