Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-24 18:41:46 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-24 18:42:52 +0300
commit253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch)
treee4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/depsgraph/intern/depsgraph.cc
parentfe52a05e950e474036c80f554a4675f12203695b (diff)
parent0cff044d84646c2890f13b8915eb708861bb36d6 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph.cc')
-rw-r--r--source/blender/depsgraph/intern/depsgraph.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 3652cfe61fe..59322808100 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -154,7 +154,7 @@ static bool pointer_to_component_node_criteria(
else if (ptr->type == &RNA_Bone) {
Bone *bone = (Bone *)ptr->data;
/* armature-level bone, but it ends up going to bone component anyway */
- // NOTE: the ID in thise case will end up being bArmature.
+ // NOTE: the ID in this case will end up being bArmature.
*type = DEG_NODE_TYPE_BONE;
*subdata = bone->name;
return true;