浏览代码

Merge pull request #51503 from Chaosus/shader_fix_matrix_operators

Allow using more assignment operators on matrixes in shaders
Yuri Roubinsky 4 年之前
父节点
当前提交
6882280308
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      servers/rendering/shader_language.cpp

+ 1 - 1
servers/rendering/shader_language.cpp

@@ -1424,7 +1424,7 @@ bool ShaderLanguage::_validate_operator(OperatorNode *p_op, DataType *r_ret_type
 			DataType nb = p_op->arguments[1]->get_datatype();
 
 			if (na == nb) {
-				valid = (na > TYPE_BOOL && na < TYPE_MAT2) || (p_op->op == OP_ASSIGN_MUL && na >= TYPE_MAT2 && na <= TYPE_MAT4);
+				valid = (na > TYPE_BOOL && na <= TYPE_MAT4);
 				ret_type = na;
 			} else if (na == TYPE_IVEC2 && nb == TYPE_INT) {
 				valid = true;