diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-08-21 21:28:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-21 21:28:29 +0200 |
commit | 65c8a491221efdb4fd26ff230f22b541a2511483 (patch) | |
tree | 5d0d0fc60a96ffb0d4139f66b32074380747d9b3 /scene | |
parent | 404ee1a56b138ac6280c0cba9dbd9ea92b9e9a24 (diff) | |
parent | a1d2fbdeb29dbc0f7fa2940f9f66c161cf723180 (diff) |
Merge pull request #21250 from dragmz/ref-ptr-n(eq)-op
== and != operators for Ref<T> / T*
Diffstat (limited to 'scene')
-rw-r--r-- | scene/resources/material.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index d6c22d5664..143a1438ea 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -34,7 +34,7 @@ void Material::set_next_pass(const Ref<Material> &p_pass) { - ERR_FAIL_COND(p_pass.ptr() == this); + ERR_FAIL_COND(p_pass == this); if (next_pass == p_pass) return; |