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

2017-10-03 12:20:32 +00:00
parent b46b9329f3
commit 7ad19d72c5
40 changed files with 320 additions and 712 deletions
--- a/qglview/glmaterial.h
+++ b/qglview/glmaterial.h
@@ -104,7 +104,7 @@ struct Map {

 struct Material {
 	Material();
-	void apply(QGLShaderProgram * prog);
+	void apply(__GLShaderProgram__ * prog);
 	void loadTextures(GLTextureManagerBase * tm = 0);
 	QString name;
 	QColor color_diffuse;