Release version 1.3.7

Dima-369 · Jun 15, 2017 · d96b5b7 · d96b5b7
2 parents 6a9de09 + 4c7fd29
commit d96b5b7
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Visual editor for the VMT filetype, used by Source Engine 1, written in C++ and
 
 Includes texture preview, parameter validation and generally tries to help in editing VMTs.
 
-![version](https://img.shields.io/badge/version-1.3.6-blue.svg)
+![version](https://img.shields.io/badge/version-1.3.7-blue.svg)
 
 ## Features
 

diff --git a/app.rc b/app.rc
@@ -5,16 +5,16 @@ IDI_ICON3 ICON DISCARDABLE "vtffile.ico"
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION     1,3,6
-PRODUCTVERSION  1,3,6
+FILEVERSION     1,3,7
+PRODUCTVERSION  1,3,7
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "040904E4"
         BEGIN
             VALUE "FileDescription",    "VMT Editor"
-            VALUE "FileVersion",        "1.3.6"
-            VALUE "ProductVersion",     "1.3.6"
+            VALUE "FileVersion",        "1.3.7"
+            VALUE "ProductVersion",     "1.3.7"
             VALUE "ProductName",        "VMT Editor"
             VALUE "LegalCopyright",     "Copyright � 2016-2017"
         END

diff --git a/misc/version.txt b/misc/version.txt
@@ -1 +1 @@
-1.3.6
+1.3.7
diff --git a/screenshots/1.png b/screenshots/1.png
diff --git a/screenshots/2.png b/screenshots/2.png
diff --git a/screenshots/3.png b/screenshots/3.png
diff --git a/screenshots/4.png b/screenshots/4.png
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -7897,7 +7897,7 @@ void MainWindow::browseVTF()
 	else if (name == "toolButton_envmap" )
 		processVtf( "", "", ui->lineEdit_envmap );
 	else if (name == "toolButton_specmap" )
-		processVtf( "", "", ui->lineEdit_specmap );
+		processVtf( "preview_spec1", "", ui->lineEdit_specmap );
 
 	else if (name == "toolButton_exponentTexture" )
 		processVtf( "preview_exponent", "", ui->lineEdit_exponentTexture );
@@ -9986,6 +9986,7 @@ void MainWindow::reconvertTexture()
 	else if( objectName == "lineEdit_bump2" )
 		preview = "preview_bumpmap2";
 	else if( objectName == "lineEdit_specmap" ) {
+		preview = "preview_spec1";
 		type = 3;
 		if (ui->checkBox_envmapAlpha->isChecked() )
 			noAlpha = false;
@@ -10000,7 +10001,7 @@ void MainWindow::reconvertTexture()
 		type = 4;
 	}
 
-	else if( objectName == "lineEdit_detail" )
+	else if( objectName == "lineEdit_blendmodulate" )
 		preview = "preview_blendmod";
 
 	if ( objectName == "lineEdit_bumpmap" ||
@@ -10011,8 +10012,12 @@ void MainWindow::reconvertTexture()
 		 objectName == "lineEdit_waterNormalMap" )
 		type = 2;
 
-	if( (objectName == "lineEdit_bumpmap" && ui->lineEdit_bumpmapAlpha->isVisible()) ||
-		(objectName == "lineEdit_diffuse" && ui->lineEdit_diffuseAlpha->isVisible()) ) {
+	if( (objectName == "lineEdit_bumpmap" &&
+		 ui->lineEdit_bumpmapAlpha->isVisible() &&
+		 !ui->lineEdit_bumpmapAlpha->text().isEmpty()) ||
+		(objectName == "lineEdit_diffuse" &&
+		 ui->lineEdit_diffuseAlpha->isVisible() &&
+		 !ui->lineEdit_diffuseAlpha->text().isEmpty()) ) {
 		combine = true;
 		noAlpha = false;
 	}