[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28762] trunk/blender/source/blender/ editors/animation/keyingsets.c: Fixes for crashes when trying to add/ remove properties from builtin Keying Sets, which shouldn' t be editable in this way.

[Joshua Leung]

Revision: 28762
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28762
Author:   aligorith
Date:     2010-05-14 12:28:29 +0200 (Fri, 14 May 2010)

Log Message:
-----------
Fixes for crashes when trying to add/remove properties from builtin Keying Sets, which shouldn't be editable in this way.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/keyingsets.c

Modified: trunk/blender/source/blender/editors/animation/keyingsets.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyingsets.c	2010-05-14 10:21:57 UTC (rev 28761)
+++ trunk/blender/source/blender/editors/animation/keyingsets.c	2010-05-14 10:28:29 UTC (rev 28762)
@@ -164,6 +164,10 @@
 		BKE_report(op->reports, RPT_ERROR, "No active Keying Set to remove");
 		return OPERATOR_CANCELLED;
 	}
+	else if (scene->active_keyingset < 0) {
+		BKE_report(op->reports, RPT_ERROR, "Cannot remove built in Keying Set");
+		return OPERATOR_CANCELLED;
+	}
 	else
 		ks= BLI_findlink(&scene->keyingsets, scene->active_keyingset-1);
 	
@@ -315,6 +319,10 @@
 		
 		scene->active_keyingset= BLI_countlist(&scene->keyingsets);
 	}
+	else if (scene->active_keyingset < 0) {
+		BKE_report(op->reports, RPT_ERROR, "Cannot add property to built in Keying Set");
+		return OPERATOR_CANCELLED;
+	}
 	else
 		ks= BLI_findlink(&scene->keyingsets, scene->active_keyingset-1);
 	
@@ -396,6 +404,10 @@
 		BKE_report(op->reports, RPT_ERROR, "No active Keying Set to remove property from");
 		return OPERATOR_CANCELLED;
 	}
+	else if (scene->active_keyingset < 0) {
+		BKE_report(op->reports, RPT_ERROR, "Cannot remove property from built in Keying Set");
+		return OPERATOR_CANCELLED;
+	}
 	else
 		ks= BLI_findlink(&scene->keyingsets, scene->active_keyingset-1);