aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde2017-01-10 15:31:03 +0100
committerGitHub2017-01-10 15:31:03 +0100
commit0507f87de9127062d2df9d5fcfdfdc43d7848c45 (patch)
treea89960019e5c8231dc129b13adf7eab82aac008d /core
parent82ea31e42a5ab05ce252323890c3b49efcec9c93 (diff)
parentbf990b0822c1b5a09f9584ed7c2b83edecabf375 (diff)
downloadgodot-0507f87de9127062d2df9d5fcfdfdc43d7848c45.tar.gz
godot-0507f87de9127062d2df9d5fcfdfdc43d7848c45.tar.zst
godot-0507f87de9127062d2df9d5fcfdfdc43d7848c45.zip
Merge pull request #7491 from BastiaanOlij/tools-no-fixes
Few small fixes so tools=no and target=release compiles
Diffstat (limited to '')
-rw-r--r--core/rid.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/rid.h b/core/rid.h
index 466e92296..8dc535c9c 100644
--- a/core/rid.h
+++ b/core/rid.h
@@ -113,15 +113,15 @@ protected:
#ifndef DEBUG_ENABLED
- _FORCE_INLINE_ bool _is_owner(RID& p_rid) const {
+ _FORCE_INLINE_ bool _is_owner(const RID& p_rid) const {
- return this==p_rid._owner;
+ return this==p_rid._data->_owner;
}
_FORCE_INLINE_ void _remove_owner(RID& p_rid) {
- return p_rid._owner=NULL;
+ p_rid._data->_owner=NULL;
}
#