From e930fb9a6e4277ad3c4dc60a775785b294840512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 2 Mar 2019 00:45:01 +0100 Subject: [PATCH] Fix typo in 7bad170 And cleanup. --- drivers/gles2/shader_gles2.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp index ee96db99fea..df7b170bf4e 100644 --- a/drivers/gles2/shader_gles2.cpp +++ b/drivers/gles2/shader_gles2.cpp @@ -839,7 +839,7 @@ void ShaderGLES2::use_material(void *p_material) { } break; default: { - ERR_PRINT("type missing, bug?"); + ERR_PRINT("ShaderNode type missing, bug?"); } break; } } else if (E->get().default_value.size()) { @@ -970,7 +970,7 @@ void ShaderGLES2::use_material(void *p_material) { // Nothing to do? } break; default: { - ERR_PRINT("type missing, bug?"); + ERR_PRINT("ShaderNode type missing, bug?"); } break; } } else { //zero @@ -1041,7 +1041,7 @@ void ShaderGLES2::use_material(void *p_material) { } break; case ShaderLanguage::TYPE_MAT2: { - GLfloat mat[4]{ 0, 0, 0, 0 }; + GLfloat mat[4] = { 0, 0, 0, 0 }; glUniformMatrix2fv(location, 1, GL_FALSE, mat); } break; @@ -1054,22 +1054,7 @@ void ShaderGLES2::use_material(void *p_material) { } break; case ShaderLanguage::TYPE_MAT4: { - GLfloat mat[16] = { 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 }; + GLfloat mat[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; glUniformMatrix4fv(location, 1, GL_FALSE, mat); @@ -1104,7 +1089,7 @@ void ShaderGLES2::use_material(void *p_material) { // Nothing to do? } break; default: { - ERR_PRINT("type missing, bug?"); + ERR_PRINT("ShaderNode type missing, bug?"); } break; } }