diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/blenkernel/intern/ipo.c | |
parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/ipo.c')
-rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 941c7eb2a87..82178096b46 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -251,7 +251,7 @@ static const char *ob_adrcodes_to_paths(int adrcode, int *array_index) } /* PoseChannel types - * NOTE: pchan name comes from 'actname' added earlier... + * NOTE: pchan name comes from 'actname' added earlier... */ static const char *pchan_adrcodes_to_paths(int adrcode, int *array_index) { @@ -314,7 +314,7 @@ static const char *constraint_adrcodes_to_paths(int adrcode, int *array_index) } /* ShapeKey types - * NOTE: as we don't have access to the keyblock where the data comes from (for now), + * NOTE: as we don't have access to the keyblock where the data comes from (for now), * we'll just use numerical indices for now... */ static char *shapekey_adrcodes_to_paths(ID *id, int adrcode, int *UNUSED(array_index)) @@ -1672,10 +1672,10 @@ static void nlastrips_to_animdata(ID *id, ListBase *strips) /* Called from do_versions() in readfile.c to convert the old 'IPO/adrcode' system * to the new 'Animato/RNA' system. * - * The basic method used here, is to loop over datablocks which have IPO-data, and - * add those IPO's to new AnimData blocks as Actions. + * The basic method used here, is to loop over datablocks which have IPO-data, and + * add those IPO's to new AnimData blocks as Actions. * Action/NLA data only works well for Objects, so these only need to be checked for there. - * + * * Data that has been converted should be freed immediately, which means that it is immediately * clear which datablocks have yet to be converted, and also prevent freeing errors when we exit. */ |