asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #70350 from Chaosus/stringname_operator

Browse source 
Add missing != operator to `StringName`
This commit is contained in:
Rémi Verschelde 2022-12-21 09:21:32 +01:00
commit 4f3ec4121a
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/string/string_name.cpp
View file

@ -169,6 +169,10 @@ bool StringName::operator!=(const String &p_name) const {
return !(operator==(p_name));
}
bool StringName::operator!=(const char *p_name) const {
return !(operator==(p_name));
}
bool StringName::operator!=(const StringName &p_name) const {
// the real magic of all this mess happens here.
// this is why path comparisons are very fast

1
core/string/string_name.h
View file

@ -102,6 +102,7 @@ public:
bool operator==(const String &p_name) const;
bool operator==(const char *p_name) const;
bool operator!=(const String &p_name) const;
bool operator!=(const char *p_name) const;
_FORCE_INLINE_ bool is_node_unique_name() const {
if (!_data) {

2
editor/plugins/visual_shader_editor_plugin.cpp
View file

@ -1263,7 +1263,7 @@ Dictionary VisualShaderEditor::get_custom_node_data(Ref<VisualShaderNodeCustom>
void VisualShaderEditor::update_custom_type(const Ref<Resource> &p_resource) {
Ref<Script> scr = Ref<Script>(p_resource.ptr());
if (scr.is_null() || scr->get_instance_base_type() != String("VisualShaderNodeCustom")) {
if (scr.is_null() || scr->get_instance_base_type() != "VisualShaderNodeCustom") {
return;
}

2
servers/rendering/shader_language.cpp
View file

@ -4417,7 +4417,7 @@ bool ShaderLanguage::_is_operator_assign(Operator p_op) const {
}
bool ShaderLanguage::_validate_varying_assign(ShaderNode::Varying &p_varying, String *r_message) {
if (current_function != String("vertex") && current_function != String("fragment")) {
if (current_function != "vertex" && current_function != "fragment") {
*r_message = vformat(RTR("Varying may not be assigned in the '%s' function."), current_function);
return false;
}