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

2019-05-24 19:06:35 +00:00
parent 1082db07c6
commit 58fce3cd81
29 changed files with 394 additions and 599 deletions
--- a/qglview/glmaterial.cpp
+++ b/qglview/glmaterial.cpp
@@ -226,7 +226,7 @@ Material::Material(): map_reflection(512) {
 }


-void Material::apply(__GLShaderProgram__ * prog) {
+void Material::apply(QOpenGLShaderProgram * prog) {
 	if (prog) {
 		setUniformMaterial(prog, *this);
 	} else {