diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-09-13 16:44:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-13 16:44:13 +0300 |
commit | 37d8d4787cfa3d04b09f935c5600f1a3ea7b74e7 (patch) | |
tree | b60dfc428ccd61b5b3af6a06cee6ddbe69d3973e /source/blender/makesrna/intern/rna_animation.c | |
parent | 9abacf38fd4f3b0de4b6d9a4644b9cb1155482c9 (diff) | |
parent | 6f633dec5d105ad91dcb5774a6fd4fb06bf264a5 (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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 9745d8fae56..1f5ddddb74f 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -247,8 +247,9 @@ static void rna_KeyingSetInfo_unregister(Main *bmain, StructRNA *type) ANIM_keyingset_info_unregister(bmain, ksi); } -static StructRNA *rna_KeyingSetInfo_register(Main *bmain, ReportList *reports, void *data, const char *identifier, - StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free) +static StructRNA *rna_KeyingSetInfo_register( + Main *bmain, ReportList *reports, void *data, const char *identifier, + StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free) { KeyingSetInfo dummyksi = {NULL}; KeyingSetInfo *ksi; |