From 0555e031098722337ffd4c944cfb04c8dfd579de Mon Sep 17 00:00:00 2001
From: cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Thu, 5 May 2022 13:28:44 +0000
Subject: [PATCH] Merging r6381 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6382 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 source/Irrlicht/Irrlicht-gcc.cbp             | 2 +-
 source/Irrlicht/Irrlicht10.0.vcxproj         | 2 +-
 source/Irrlicht/Irrlicht10.0.vcxproj.filters | 6 +++---
 source/Irrlicht/Irrlicht11.0.vcxproj         | 2 +-
 source/Irrlicht/Irrlicht11.0.vcxproj.filters | 6 +++---
 source/Irrlicht/Irrlicht12.0.vcxproj         | 2 +-
 source/Irrlicht/Irrlicht12.0.vcxproj.filters | 6 +++---
 source/Irrlicht/Irrlicht15.0.vcxproj         | 2 +-
 source/Irrlicht/Irrlicht15.0.vcxproj.filters | 6 +++---
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/source/Irrlicht/Irrlicht-gcc.cbp b/source/Irrlicht/Irrlicht-gcc.cbp
index a1dbf210..3789af68 100644
--- a/source/Irrlicht/Irrlicht-gcc.cbp
+++ b/source/Irrlicht/Irrlicht-gcc.cbp
@@ -970,11 +970,11 @@
 		<Unit filename="CTRFlatWire.cpp" />
 		<Unit filename="CTRGouraud.cpp" />
 		<Unit filename="CTRGouraud2.cpp" />
-		<Unit filename="CTRGouraudAlpha2.cpp" />
 		<Unit filename="CTRGouraudAlphaNoZ2.cpp" />
 		<Unit filename="CTRGouraudNoZ2.cpp" />
 		<Unit filename="CTRGouraudWire.cpp" />
 		<Unit filename="CTRNormalMap.cpp" />
+		<Unit filename="CTRParallaxMap.cpp" />
 		<Unit filename="CTRStencilShadow.cpp" />
 		<Unit filename="CTRTextureBlend.cpp" />
 		<Unit filename="CTRTextureDetailMap2.cpp" />
diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj
index 44ef1e24..ad9cbce2 100644
--- a/source/Irrlicht/Irrlicht10.0.vcxproj
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj
@@ -1459,9 +1459,9 @@
     <ClCompile Include="CSoftwareDriver2.cpp" />
     <ClCompile Include="CSoftwareTexture2.cpp" />
     <ClCompile Include="CTRGouraud2.cpp" />
-    <ClCompile Include="CTRGouraudAlpha2.cpp" />
     <ClCompile Include="CTRGouraudAlphaNoZ2.cpp" />
     <ClCompile Include="CTRNormalMap.cpp" />
+    <ClCompile Include="CTRParallaxMap.cpp" />
     <ClCompile Include="CTRStencilShadow.cpp" />
     <ClCompile Include="CTRTextureBlend.cpp" />
     <ClCompile Include="CTRTextureDetailMap2.cpp" />
diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
index 47dd7403..2ae9d3c0 100644
--- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
@@ -1886,15 +1886,15 @@
     <ClCompile Include="CTRGouraud2.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
-    <ClCompile Include="CTRGouraudAlpha2.cpp">
-      <Filter>Irrlicht\video\Burning Video</Filter>
-    </ClCompile>
     <ClCompile Include="CTRGouraudAlphaNoZ2.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
     <ClCompile Include="CTRNormalMap.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
+    <ClCompile Include="CTRParallaxMap.cpp">
+      <Filter>Irrlicht\video\Burning Video</Filter>
+    </ClCompile>
     <ClCompile Include="CTRStencilShadow.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
diff --git a/source/Irrlicht/Irrlicht11.0.vcxproj b/source/Irrlicht/Irrlicht11.0.vcxproj
index f3b8ca37..1c253f2b 100644
--- a/source/Irrlicht/Irrlicht11.0.vcxproj
+++ b/source/Irrlicht/Irrlicht11.0.vcxproj
@@ -1457,9 +1457,9 @@
     <ClCompile Include="CSoftwareDriver2.cpp" />
     <ClCompile Include="CSoftwareTexture2.cpp" />
     <ClCompile Include="CTRGouraud2.cpp" />
-    <ClCompile Include="CTRGouraudAlpha2.cpp" />
     <ClCompile Include="CTRGouraudAlphaNoZ2.cpp" />
     <ClCompile Include="CTRNormalMap.cpp" />
+    <ClCompile Include="CTRParallaxMap.cpp" />
     <ClCompile Include="CTRStencilShadow.cpp" />
     <ClCompile Include="CTRTextureBlend.cpp" />
     <ClCompile Include="CTRTextureDetailMap2.cpp" />
diff --git a/source/Irrlicht/Irrlicht11.0.vcxproj.filters b/source/Irrlicht/Irrlicht11.0.vcxproj.filters
index cb3787e2..0d6e8248 100644
--- a/source/Irrlicht/Irrlicht11.0.vcxproj.filters
+++ b/source/Irrlicht/Irrlicht11.0.vcxproj.filters
@@ -1883,15 +1883,15 @@
     <ClCompile Include="CTRGouraud2.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
-    <ClCompile Include="CTRGouraudAlpha2.cpp">
-      <Filter>Irrlicht\video\Burning Video</Filter>
-    </ClCompile>
     <ClCompile Include="CTRGouraudAlphaNoZ2.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
     <ClCompile Include="CTRNormalMap.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
+    <ClCompile Include="CTRParallaxMap.cpp">
+      <Filter>Irrlicht\video\Burning Video</Filter>
+    </ClCompile>
     <ClCompile Include="CTRStencilShadow.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
diff --git a/source/Irrlicht/Irrlicht12.0.vcxproj b/source/Irrlicht/Irrlicht12.0.vcxproj
index cf8b80d4..e38a6b28 100644
--- a/source/Irrlicht/Irrlicht12.0.vcxproj
+++ b/source/Irrlicht/Irrlicht12.0.vcxproj
@@ -1457,9 +1457,9 @@
     <ClCompile Include="CSoftwareDriver2.cpp" />
     <ClCompile Include="CSoftwareTexture2.cpp" />
     <ClCompile Include="CTRGouraud2.cpp" />
-    <ClCompile Include="CTRGouraudAlpha2.cpp" />
     <ClCompile Include="CTRGouraudAlphaNoZ2.cpp" />
     <ClCompile Include="CTRNormalMap.cpp" />
+    <ClCompile Include="CTRParallaxMap.cpp" />
     <ClCompile Include="CTRStencilShadow.cpp" />
     <ClCompile Include="CTRTextureBlend.cpp" />
     <ClCompile Include="CTRTextureDetailMap2.cpp" />
diff --git a/source/Irrlicht/Irrlicht12.0.vcxproj.filters b/source/Irrlicht/Irrlicht12.0.vcxproj.filters
index 17aae0d6..2ed26a10 100644
--- a/source/Irrlicht/Irrlicht12.0.vcxproj.filters
+++ b/source/Irrlicht/Irrlicht12.0.vcxproj.filters
@@ -1883,15 +1883,15 @@
     <ClCompile Include="CTRGouraud2.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
-    <ClCompile Include="CTRGouraudAlpha2.cpp">
-      <Filter>Irrlicht\video\Burning Video</Filter>
-    </ClCompile>
     <ClCompile Include="CTRGouraudAlphaNoZ2.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
     <ClCompile Include="CTRNormalMap.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
+    <ClCompile Include="CTRParallaxMap.cpp">
+      <Filter>Irrlicht\video\Burning Video</Filter>
+    </ClCompile>
     <ClCompile Include="CTRStencilShadow.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
diff --git a/source/Irrlicht/Irrlicht15.0.vcxproj b/source/Irrlicht/Irrlicht15.0.vcxproj
index 72cd3011..2378f798 100644
--- a/source/Irrlicht/Irrlicht15.0.vcxproj
+++ b/source/Irrlicht/Irrlicht15.0.vcxproj
@@ -1343,7 +1343,6 @@
     <ClCompile Include="CSkinnedMesh.cpp" />
     <ClCompile Include="CSTLMeshFileLoader.cpp" />
     <ClCompile Include="CTRGouraudNoZ2.cpp" />
-		<ClCompile Include="CTRParallaxMap.cpp" />
     <ClCompile Include="CTR_transparent_reflection_2_layer.cpp" />
     <ClCompile Include="CWGLManager.cpp" />
     <ClCompile Include="CXMeshFileLoader.cpp" />
@@ -1449,6 +1448,7 @@
     <ClCompile Include="CTRGouraud2.cpp" />
     <ClCompile Include="CTRGouraudAlphaNoZ2.cpp" />
     <ClCompile Include="CTRNormalMap.cpp" />
+    <ClCompile Include="CTRParallaxMap.cpp" />
     <ClCompile Include="CTRStencilShadow.cpp" />
     <ClCompile Include="CTRTextureBlend.cpp" />
     <ClCompile Include="CTRTextureDetailMap2.cpp" />
diff --git a/source/Irrlicht/Irrlicht15.0.vcxproj.filters b/source/Irrlicht/Irrlicht15.0.vcxproj.filters
index 162fd094..b4cd73ef 100644
--- a/source/Irrlicht/Irrlicht15.0.vcxproj.filters
+++ b/source/Irrlicht/Irrlicht15.0.vcxproj.filters
@@ -1839,15 +1839,15 @@
     <ClCompile Include="CTRGouraud2.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
-    <ClCompile Include="CTRGouraudAlpha2.cpp">
-      <Filter>Irrlicht\video\Burning Video</Filter>
-    </ClCompile>
     <ClCompile Include="CTRGouraudAlphaNoZ2.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
     <ClCompile Include="CTRNormalMap.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>
+    <ClCompile Include="CTRParallaxMap.cpp">
+      <Filter>Irrlicht\video\Burning Video</Filter>
+    </ClCompile>
     <ClCompile Include="CTRStencilShadow.cpp">
       <Filter>Irrlicht\video\Burning Video</Filter>
     </ClCompile>