small bug in topo rendering when different Selector render/picking (thanks Lionel)

f5e5e901 · Sylvain Thery · 61c2f883 · f5e5e901 · f5e5e901
Commit f5e5e901 authored Jan 06, 2012 by Sylvain Thery
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

include/Algo/Render/GL2/topo3Render.hpp include/Algo/Render/GL2/topo3Render.hpp +1 -1

include/Algo/Render/GL2/topoRender.hpp include/Algo/Render/GL2/topoRender.hpp +6 -5

No files found.
--- a/include/Algo/Render/GL2/topo3Render.hpp
+++ b/include/Algo/Render/GL2/topo3Render.hpp
@@ -311,7 +311,7 @@ void Topo3Render::setDartsIdColor(typename PFP::MAP& map, const FunctorSelect& g
 			else
 			{
 				CGoGNerr << "Error buffer too small for color picking (change the good parameter ?)" << CGoGNendl;
-				d = map.end();
+				break;
 			}
 		}
 	}

--- a/include/Algo/Render/GL2/topoRender.hpp
+++ b/include/Algo/Render/GL2/topoRender.hpp
@@ -383,12 +383,13 @@ void TopoRender::setDartsIdColor(typename PFP::MAP& map, const FunctorSelect& go

 				nb++;
 			}
+			else
+			{
+				CGoGNerr << "Error buffer too small for color picking (change the good parameter ?)" << CGoGNendl;
+				break;
+			}
 		}
-		else
-		{
-			CGoGNerr << "Error buffer too small for color picking (change the good parameter ?)" << CGoGNendl;
-			d = map.end();
-		}
+
 	}
 	glUnmapBuffer(GL_ARRAY_BUFFER);
 }