Fix typo, increase version to 3.21.4

blueburncz · Jul 4, 2024 · 4e80e65 · 4e80e65
1 parent 6c62697
commit 4e80e65
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 15 deletions.
diff --git a/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy b/BBMOD_GML/extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy
diff --git a/BBMOD_GML/options/amazonfire/options_amazonfire.yy b/BBMOD_GML/options/amazonfire/options_amazonfire.yy
diff --git a/BBMOD_GML/options/android/options_android.yy b/BBMOD_GML/options/android/options_android.yy
diff --git a/BBMOD_GML/options/html5/options_html5.yy b/BBMOD_GML/options/html5/options_html5.yy
diff --git a/BBMOD_GML/options/ios/options_ios.yy b/BBMOD_GML/options/ios/options_ios.yy
diff --git a/BBMOD_GML/options/linux/options_linux.yy b/BBMOD_GML/options/linux/options_linux.yy
diff --git a/BBMOD_GML/options/mac/options_mac.yy b/BBMOD_GML/options/mac/options_mac.yy
diff --git a/BBMOD_GML/options/operagx/options_operagx.yy b/BBMOD_GML/options/operagx/options_operagx.yy
diff --git a/BBMOD_GML/options/tvos/options_tvos.yy b/BBMOD_GML/options/tvos/options_tvos.yy
diff --git a/BBMOD_GML/options/windows/options_windows.yy b/BBMOD_GML/options/windows/options_windows.yy
diff --git a/BBMOD_GML/options/windowsuap/options_windowsuap.yy b/BBMOD_GML/options/windowsuap/options_windowsuap.yy
diff --git a/BBMOD_GML/scripts/BBMOD_DefaultShader/BBMOD_DefaultShader.gml b/BBMOD_GML/scripts/BBMOD_DefaultShader/BBMOD_DefaultShader.gml
@@ -145,7 +145,7 @@ function BBMOD_DefaultShader(_shader, _vertexFormat)
 		if (_normalRoughness != undefined)
 		{
 			bbmod_shader_set_normal_roughness(_shaderCurrent, _normalRoughness);
-			bbmod_shader_set_normal_w_uv(_shaderCurrent, texture_get_uvs(_normalSmoothness));
+			bbmod_shader_set_normal_w_uv(_shaderCurrent, texture_get_uvs(_normalRoughness));
 		}
 
 		// Specular color/Metallic and AO

diff --git a/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml b/BBMOD_GML/scripts/__bbmod_defines/__bbmod_defines.gml
@@ -12,7 +12,7 @@
 #macro BBMOD_RELEASE_MINOR 21
 
 /// @macro {Real} The patch version number of this BBMOD release.
-#macro BBMOD_RELEASE_PATCH 3
+#macro BBMOD_RELEASE_PATCH 4
 
 /// @macro {String} The version of this BBMOD release as a string ("major.minor.patch" format).
 #macro BBMOD_RELEASE_STRING $"{BBMOD_RELEASE_MAJOR}.{BBMOD_RELEASE_MINOR}.{BBMOD_RELEASE_PATCH}"

diff --git a/ChangelogDev.md b/ChangelogDev.md
@@ -1,2 +1,4 @@
 # Changelog dev
 > This file is used to accumulate changes before a changelog for a release is created.
+
+* Fixed typo in method `set_material` of `BBMOD_DefaultShader`, which tried to use the `NormalSmoothness` texture when the material was using `NormalRoughness`, causing an error.
diff --git a/docs_src/index.md b/docs_src/index.md
@@ -1,5 +1,5 @@
 # BBMOD
-Welcome to the official documentation of BBMOD 3.21.3!
+Welcome to the official documentation of BBMOD 3.21.4!
 
 BBMOD is an advanced 3D rendering solution for GameMaker. It consists of a
 custom model, animation and material formats, a model converter (BBMOD CLI),

diff --git a/gmdoc.json b/gmdoc.json
@@ -5,7 +5,7 @@
   "title": "BBMOD Docs",
   "author": "BlueBurn",
   "prefix": ["bbmod", "__bbmod"],
-  "version": "3.21.3",
+  "version": "3.21.4",
   "analytics": "",
   "api": {
     "rating": "/bbmod/page_rating.php"