forked from Mirrorlandia_minetest/irrlicht
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
This commit is contained in:
parent
67a488fc5c
commit
0555e03109
@ -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" />
|
||||
|
@ -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" />
|
||||
|
@ -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>
|
||||
|
@ -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" />
|
||||
|
@ -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>
|
||||
|
@ -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" />
|
||||
|
@ -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>
|
||||
|
@ -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" />
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user