Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop
Showing
... | ... | @@ -29,6 +29,7 @@ |
#include "Utils/vbo_base.h" | ||
#include "glm/glm.hpp" | ||
#include "Utils/Shaders/shaderSimpleColor.h" | ||
#include "Utils/Shaders/shaderBoldLines.h" | ||
#include "Utils/pickables.h" | ||
#include "Utils/dll.h" | ||
... | ... | @@ -71,12 +72,13 @@ protected: |
/** | ||
< |