Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2010-03-17 14:34:27 +0300
committerJoshua Leung <aligorith@gmail.com>2010-03-17 14:34:27 +0300
commitbe3d5f9d5df90737c01338266efd72b3367b9e6c (patch)
treeafb137909b69c50ad3538b4e7de2fc3195d4eff0 /source/blender/editors
parent1d4b93214520045e67eb535393d6056f41feaa54 (diff)
PyKeyingSet Bugfixes:
* With multiple objects selected, only one of the objects got keyframed. The code which was checking for duplicate paths was wrongly assuming to ignore the ID-block used still. * Not registering a Keying Set as 'builtin' would crash on startup. I've made all Keying Sets fallback to adding as if they were local for now, but a better solution is coming soon. * Fixed a typo in RNA function wrappers for the generator callback, since it was looking for the iterator only. This doesn't seem to have caused any problems (thankfully).
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/animation/keyingsets.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 1e4180a3ae7..b1f1cbbea1e 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -526,10 +526,10 @@ void ANIM_keyingset_info_register (const bContext *C, KeyingSetInfo *ksi)
KeyingSet *ks;
/* determine the KeyingSet list to include the new KeyingSet in */
- if (ksi->builtin)
- list = &builtin_keyingsets;
- else
+ if (ksi->builtin==0 && scene)
list = &scene->keyingsets;
+ else
+ list = &builtin_keyingsets;
/* create a new KeyingSet
* - inherit name and keyframing settings from the typeinfo