[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22593] branches/blender2.5/blender/source /blender: 2. 5 - Newly created KeyingSets are now automatically named properly.
Joshua Leung
aligorith at gmail.com
Tue Aug 18 06:15:47 CEST 2009
Revision: 22593
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22593
Author: aligorith
Date: 2009-08-18 06:15:47 +0200 (Tue, 18 Aug 2009)
Log Message:
-----------
2.5 - Newly created KeyingSets are now automatically named properly.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c 2009-08-18 04:15:28 UTC (rev 22592)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c 2009-08-18 04:15:47 UTC (rev 22593)
@@ -276,7 +276,7 @@
if (name)
BLI_snprintf(ks->name, 64, name);
else
- strcpy(ks->name, "Keying Set");
+ strcpy(ks->name, "KeyingSet");
ks->flag= flag;
ks->keyingflag= keyingflag;
@@ -285,7 +285,7 @@
BLI_addtail(list, ks);
/* make sure KeyingSet has a unique name (this helps with identification) */
- BLI_uniquename(list, ks, "Keying Set", ' ', offsetof(KeyingSet, name), 64);
+ BLI_uniquename(list, ks, "KeyingSet", '.', offsetof(KeyingSet, name), 64);
/* return new KeyingSet for further editing */
return ks;
Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-08-18 04:15:28 UTC (rev 22592)
+++ branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-08-18 04:15:47 UTC (rev 22593)
@@ -3901,7 +3901,7 @@
/* add if none found */
// XXX the default settings have yet to evolve
if ((add) && (ks==NULL)) {
- ks= BKE_keyingset_add(&scene->keyingsets, "Keying Set", KEYINGSET_ABSOLUTE, 0);
+ ks= BKE_keyingset_add(&scene->keyingsets, NULL, KEYINGSET_ABSOLUTE, 0);
scene->active_keyingset= BLI_countlist(&scene->keyingsets);
}
Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c 2009-08-18 04:15:28 UTC (rev 22592)
+++ branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c 2009-08-18 04:15:47 UTC (rev 22593)
@@ -177,7 +177,7 @@
/* add a new KeyingSet if active is -1 */
if (scene->active_keyingset == -1) {
// XXX the default settings have yet to evolve... need to keep this in sync with the
- BKE_keyingset_add(&scene->keyingsets, "KeyingSet", KEYINGSET_ABSOLUTE, 0);
+ BKE_keyingset_add(&scene->keyingsets, NULL, KEYINGSET_ABSOLUTE, 0);
scene->active_keyingset= BLI_countlist(&scene->keyingsets);
}
@@ -196,6 +196,8 @@
BLI_freelinkN(&scene->keyingsets, ks);
scene->active_keyingset= 0;
}
+ else
+ scene->active_keyingset= 0;
}
/* redraw regions with KeyingSet info */
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c 2009-08-18 04:15:28 UTC (rev 22592)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c 2009-08-18 04:15:47 UTC (rev 22593)
@@ -1845,6 +1845,7 @@
prop= RNA_def_property(srna, "active_keying_set", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "KeyingSet");
+ RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_editable_func(prop, "rna_Scene_active_keying_set_editable");
RNA_def_property_pointer_funcs(prop, "rna_Scene_active_keying_set_get", "rna_Scene_active_keying_set_set", NULL);
RNA_def_property_ui_text(prop, "Active Keying Set", "Active Keying Set used to insert/delete keyframes.");
More information about the Bf-blender-cvs
mailing list