0.4.1 hotfix

hakasapl · Jul 19, 2024 · acbd8c6 · acbd8c6
1 parent 4fc70a2
commit acbd8c6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.4.1] - 2024-07-18
+
+- Fixed already generated complex parallax maps regenerating if a heightmap was also included
+
 ## [0.4.0] - 2024-07-18
 
 - Added --upgrade-shader argument to enable upgrading vanilla parallax to complex material

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(PROJECT_NAME "ParallaxGen")
 set(PROJECT_URI "com.github.hakasapl.ParallaxGen")
 
 # Initialize Project
-set(PARALLAXGEN_VERSION 0.4.0)
+set(PARALLAXGEN_VERSION 0.4.1)
 project(${PROJECT_NAME} VERSION ${PARALLAXGEN_VERSION})
 
 # Define preprocessor macro with the version number

diff --git a/src/ParallaxGen/ParallaxGen.cpp b/src/ParallaxGen/ParallaxGen.cpp
@@ -54,6 +54,12 @@ void ParallaxGen::upgradeShaders()
 		fs::path env_map_path = pgd->changeDDSSuffix(height_map, L"_m");
 		fs::path complex_map_path = env_map_path;
 
+		if (pgd->isFile(env_map_path) && pgd->isComplexMaterialMap(env_map_path)) {
+			// already upgraded
+			finished_task++;
+			continue;
+		}
+
 		if (!pgd->isFile(env_map_path))
 		{
 			// no env map