git-svn-id: svn://db.shs.com.ru/libs@44 a8b55f48-bf90-11e4-a774-851b48703e85

2015-11-20 21:19:36 +00:00
parent cabaead1c6
commit 104a7f99ad
48 changed files with 1973 additions and 1273 deletions
--- a/qglview/glparticles_system.cpp
+++ b/qglview/glparticles_system.cpp
@@ -107,7 +107,7 @@ void GLParticlesSystem::update() {
 }


-void GLParticlesSystem::draw(bool) {
+void GLParticlesSystem::draw(QGLShaderProgram * prog, bool) {
 	if (particles.isEmpty()) return;
 	if (view_ == 0) return;
 	pass_ = GLObjectBase::Transparent;