diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
| commit | be403891652a375e5a0ac61b493342ca6d39afb7 (patch) | |
| tree | ef9637103db6d66c4b311cba5b705d575562a1f8 /source/blender/editors/armature/armature_relations.c | |
| parent | 060fdb49d64857ff1cbf9937420ed70b10b17086 (diff) | |
| parent | cbc7aa80d49e3b36c9ecc0e27ec528b34c491fc1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature/armature_relations.c')
| -rw-r--r-- | source/blender/editors/armature/armature_relations.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 1d63b3aee43..ccaa9ecb8de 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -126,7 +126,7 @@ typedef struct tJoinArmature_AdtFixData { GHash *names_map; } tJoinArmature_AdtFixData; -/* Callback to pass to void BKE_animdata_main_cb() for fixing driver ID's to point to the new ID */ +/* Callback to pass to BKE_animdata_main_cb() for fixing driver ID's to point to the new ID */ /* FIXME: For now, we only care about drivers here. When editing rigs, it's very rare to have animation * on the rigs being edited already, so it should be safe to skip these. */ |