diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-03-18 10:53:46 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-03-18 10:53:46 +0300 |
| commit | 9ebde542ece4ce13c4f8375e879a6c497b4da3f7 (patch) | |
| tree | 1b1f40f42372141f3220ada94ea1992ac3e49ac9 /source/blender/makesrna | |
| parent | 3566400dc53bcb2d07b760775d607330e3ea5d54 (diff) | |
Bugfix: Autokeying was non-functional after the Keying Sets refactor
- The RNA wrapping for the generate callback was still wrong, with the primary effect being that C-code calling this had unexpected consequences that were hard to debug.
- Fixed some defective checks that meant that when specifying the RNA-pointers for the Keying Set to use (rather than using the Keying Set's own iterator callback) would never add any info.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 27f0dc5eafb..ebb251c32ca 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -131,7 +131,7 @@ static void RKS_GEN_rna_internal(KeyingSetInfo *ksi, bContext *C, KeyingSet *ks, RNA_parameter_set_lookup(&list, "ksi", &ksi); RNA_parameter_set_lookup(&list, "context", &C); RNA_parameter_set_lookup(&list, "ks", &ks); - RNA_parameter_set_lookup(&list, "data", &data); + RNA_parameter_set_lookup(&list, "data", data); /* execute the function */ ksi->ext.call(&ptr, func, &list); @@ -404,7 +404,7 @@ static void rna_def_keyingset_info(BlenderRNA *brna) RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_pointer(func, "ks", "KeyingSet", "", ""); RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_pointer(func, "data", NULL, "", ""); // "AnyType"... + parm= RNA_def_pointer(func, "data", "AnyType", "", ""); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR|PROP_NEVER_NULL); } |