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>2009-01-20 14:07:42 +0300
committerJoshua Leung <aligorith@gmail.com>2009-01-20 14:07:42 +0300
commit8c479bc9332bcb4a3b6b0e47346287f491532729 (patch)
tree29736f74287c57d594b1397cf33e46260ba4ea1b /source/blender/blenloader
parent42c8b6a684b9db3b022542f6aaef49d74ddcd3e6 (diff)
Animato - Restoring most of Action Editor
* Streamlined the filtering code to remove a few redundant options, which required tweaking the code for most tools * F-Curves are simply displayed using their full paths right now. This should eventually be the UI-string stored in RNA, but right now there are still a few missing things. * There are a few tools which are not available yet which were available in 2.5 before Animato was added: - Copy/Paste - Rearrange channels Also, the DopeSheet is not totally functional (in terms of displaying animation data for sub-object data yet). That will be added tomorrow. * Added 'Action Group' pointer to F-Curves, as it will be handy for allowing Bone channels to still remain grouped as they were before with the Action Channels. However, reintroducing such a structure to the data-storage is not anticipated...
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 94db9c9d192..2e6a8468dae 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1837,6 +1837,9 @@ static void direct_link_fcurves(FileData *fd, ListBase *list)
/* rna path */
fcu->rna_path= newdataadr(fd, fcu->rna_path);
+ /* group */
+ fcu->grp= newdataadr(fd, fcu->grp);
+
/* driver */
fcu->driver= newdataadr(fd, fcu->driver);
if (fcu->driver) {
@@ -1917,10 +1920,8 @@ static void direct_link_action(FileData *fd, bAction *act)
direct_link_fcurves(fd, &act->curves);
for (agrp = act->groups.first; agrp; agrp= agrp->next) {
- if (agrp->channels.first) {
- agrp->channels.first= newdataadr(fd, agrp->channels.first);
- agrp->channels.last= newdataadr(fd, agrp->channels.last);
- }
+ agrp->channels.first= newdataadr(fd, agrp->channels.first);
+ agrp->channels.last= newdataadr(fd, agrp->channels.last);
}
}