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/water_system.cpp
+++ b/qglview/water_system.cpp
@@ -172,7 +172,7 @@ void WaterSystem::Particle::process(const QList<QVector<Particle> * > & near_par
 }


-void WaterSystem::draw(bool simplest) {
+void WaterSystem::draw(QGLShaderProgram * prog, bool simplest) {
 	//return;
 	pass_ = GLObjectBase::Transparent;
 	//qDebug() << "save states" << cv.size();