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

qglengine/core/glcubemap.cpp

@@ -234,6 +234,13 @@ void CubeTexture::load() {
 		QSize sz;
 		QVector<QVector3D> data = loadFileHDR(hdr_path, &sz);
 		loadHDR(data, sz);
+	} else {
+		destroy();
+		bind();
+		for (int i = 0; i < 6; ++i) {
+			f->glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, format_, 1, 1, 0, GL_RGB, GL_FLOAT, 0);
+		}
+		f->glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
 	}
 	changed_ = false;
 }

qglengine/qglview.h

@@ -246,7 +246,7 @@ public slots:
 	void setGamma(const float & arg) {renderer_.gamma_ = arg;}
 	void setAutoExposure(bool arg) {renderer_.tone_proc.enabled = arg;}
 	void setAmbientColor(const QColor & arg) {ambientColor_ = arg;}
-	void setEnvironmentMapFile(QString file) {renderer_.tex_env.setFileHDR(file);}
+	void setEnvironmentMapFile(QString file) {renderer_.tex_env.setFileHDR(file); renderer_.recreateMaterialThumbnails(true);}
 	void setFogColor(const QColor & arg) {fogColor_ = arg;}
 	void setFogDensity(const float & arg) {fogDensity_ = arg;}
 	void setFogDecay(const float & arg) {fogDecay_ = arg;}

qglengine/widgets/view_editor.ui

@@ -196,6 +196,9 @@
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>