diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
| commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
| tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender/makesrna/intern/rna_animation.c | |
| parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
| parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_animation.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 6e436b8ff32..e53533df782 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -676,7 +676,7 @@ static void rna_def_keyingset_info(BlenderRNA *brna) /* Regarding why we don't use rna_def_common_keying_flags() here: * - Using it would keep this case in sync with the other places - * where these options are exposed (which are optimised for being + * where these options are exposed (which are optimized for being * used in the UI). * - Unlike all the other places, this case is used for defining * new "built in" Keying Sets via the Python API. In that case, |