Browse Source

Merge pull request #35986 from Chaosus/shader_index

Allow non-constants for indexing builtin types in shaders
Rémi Verschelde 5 years ago
parent
commit
cdce912de7
1 changed files with 0 additions and 9 deletions
  1. 0 9
      servers/visual/shader_language.cpp

+ 0 - 9
servers/visual/shader_language.cpp

@@ -3301,9 +3301,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 								_set_error("Index out of range (0-1)");
 								_set_error("Index out of range (0-1)");
 								return NULL;
 								return NULL;
 							}
 							}
-						} else {
-							_set_error("Only integer constants are allowed as index at the moment");
-							return NULL;
 						}
 						}
 
 
 						switch (expr->get_datatype()) {
 						switch (expr->get_datatype()) {
@@ -3327,9 +3324,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 								_set_error("Index out of range (0-2)");
 								_set_error("Index out of range (0-2)");
 								return NULL;
 								return NULL;
 							}
 							}
-						} else {
-							_set_error("Only integer constants are allowed as index at the moment");
-							return NULL;
 						}
 						}
 
 
 						switch (expr->get_datatype()) {
 						switch (expr->get_datatype()) {
@@ -3352,9 +3346,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 								_set_error("Index out of range (0-3)");
 								_set_error("Index out of range (0-3)");
 								return NULL;
 								return NULL;
 							}
 							}
-						} else {
-							_set_error("Only integer constants are allowed as index at the moment");
-							return NULL;
 						}
 						}
 
 
 						switch (expr->get_datatype()) {
 						switch (expr->get_datatype()) {