diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-01-30 14:04:13 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-01-30 14:04:48 +0300 |
commit | 2142288eae7322b923e0369c07d5013d9a160774 (patch) | |
tree | afe606e541dc9102fc468ccb12ca9470672ba6a3 /source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc | |
parent | 543685fe3d62841a12c1b86ccb1cf419d8752b67 (diff) | |
parent | 87b551e8365954d03d1c27303b9776deefd4e4d3 (diff) |
Merge remote-tracking branch 'origin/blender-v2.82-release'
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc index 61c23becfda..5483ff9c030 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc @@ -91,7 +91,7 @@ void RootPChanMap::add_bone(const char *bone, const char *root) } /* Check if there's a common root bone between two bones. */ -bool RootPChanMap::has_common_root(const char *bone1, const char *bone2) +bool RootPChanMap::has_common_root(const char *bone1, const char *bone2) const { /* Ensure that both are in the map... */ if (BLI_ghash_haskey(map_, bone1) == false) { |