2.5 - Newly created KeyingSets are now automatically named properly.

2 files changed, 4 insertions, 2 deletions

diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index fffec61ec60..762ad82344b 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -3901,7 +3901,7 @@ static KeyingSet *verify_active_keyingset(Scene *scene, short add)
 	/* 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);
 	}
 	
diff --git a/source/blender/editors/space_outliner/outliner_header.c b/source/blender/editors/space_outliner/outliner_header.c
index 0c7859ed4e2..d4eeaabd1d3 100644
--- a/source/blender/editors/space_outliner/outliner_header.c
+++ b/source/blender/editors/space_outliner/outliner_header.c
@@ -177,7 +177,7 @@ static void do_outliner_buttons(bContext *C, void *arg, int event)
 			/* 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 @@ static void do_outliner_buttons(bContext *C, void *arg, int event)
 					BLI_freelinkN(&scene->keyingsets, ks);
 					scene->active_keyingset= 0;
 				}
+				else
+					scene->active_keyingset= 0;
 			}
 			
 			/* redraw regions with KeyingSet info */