- see if this fixes color picking

This commit is contained in:
Mark Vejvoda
2013-01-15 00:38:45 +00:00
parent 4d0811f0ec
commit 6f0c700acf

View File

@@ -1527,24 +1527,25 @@ void BaseColorPickEntity::beginPicking() {
//glClearColor (0.0,0.0,0.0,0.0); //glClearColor (0.0,0.0,0.0,0.0);
//glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//glClear(GL_COLOR_BUFFER_BIT); //glClear(GL_COLOR_BUFFER_BIT);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_FOG); //glDisable(GL_FOG);
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_MULTISAMPLE); //glDisable(GL_MULTISAMPLE);
glDisable(GL_DITHER); //glDisable(GL_DITHER);
} }
void BaseColorPickEntity::endPicking() { void BaseColorPickEntity::endPicking() {
// turn off texturing, lighting and fog // turn off texturing, lighting and fog
glEnable(GL_TEXTURE_2D); //glEnable(GL_TEXTURE_2D);
glEnable(GL_FOG); //glEnable(GL_FOG);
glEnable(GL_LIGHTING); //glEnable(GL_LIGHTING);
glEnable(GL_BLEND); //glEnable(GL_BLEND);
glEnable(GL_MULTISAMPLE); //glEnable(GL_MULTISAMPLE);
glEnable(GL_DITHER); //glEnable(GL_DITHER);
} }
vector<int> BaseColorPickEntity::getPickedList(int x,int y,int w,int h, vector<int> BaseColorPickEntity::getPickedList(int x,int y,int w,int h,