summaryrefslogtreecommitdiff
path: root/servers
diff options
context:
space:
mode:
authorreduz <reduzio@gmail.com>2014-06-29 19:08:46 -0300
committerreduz <reduzio@gmail.com>2014-06-29 19:08:46 -0300
commit97731696c9e45a351d64660b46c6d027f3b0a25e (patch)
tree040165bdf166cf0464d5d8acf84757acce37a675 /servers
parentae5b064427374eeef64ad9369307c5800ef25bf0 (diff)
parentd29ccb4db3f5d97c56a01507552e77f748ef7cd4 (diff)
Merge pull request #541 from marynate/PR-fix-uv-xform
Fix FixedMaterial uv xform not working bug
Diffstat (limited to 'servers')
-rw-r--r--servers/visual/rasterizer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/visual/rasterizer.cpp b/servers/visual/rasterizer.cpp
index e242744867..610e9a6a1b 100644
--- a/servers/visual/rasterizer.cpp
+++ b/servers/visual/rasterizer.cpp
@@ -60,7 +60,7 @@ RID Rasterizer::_create_shader(const FixedMaterialShaderKey& p_key) {
int texcoords_used=0;
String code;
- static const char* _uv_str[4]={"UV","UV2","uv_xform","uv_sphere"};
+ static const char* _uv_str[4]={"UV","uv_xform","UV2","uv_sphere"};
#define _TEXUVSTR(m_idx) String( _uv_str[(p_key.texcoord_mask>>(m_idx*2))&0x3] )