[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23818] trunk/blender/source/blender/ editors: * Fixed crash with operator cheat-sheet

[Joshua Leung]

Revision: 23818
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23818
Author:   aligorith
Date:     2009-10-14 02:01:34 +0200 (Wed, 14 Oct 2009)

Log Message:
-----------
* Fixed crash with operator cheat-sheet
* Removed obsolete comment

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_draw.c
    trunk/blender/source/blender/editors/armature/poselib.c

Modified: trunk/blender/source/blender/editors/animation/anim_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_draw.c	2009-10-13 23:15:34 UTC (rev 23817)
+++ trunk/blender/source/blender/editors/animation/anim_draw.c	2009-10-14 00:01:34 UTC (rev 23818)
@@ -340,7 +340,6 @@
 		xco += 5;
 		
 		/* datatype based - only available datatypes are shown */
-		// TODO: only show the datablocks which exist
 		uiBlockBeginAlign(block);
 			uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSCE, B_REDR, ICON_SCENE_DATA,	(short)(xco+=XIC),yco,XIC,YIC, &(ads->filterflag), 0, 0, 0, 0, "Display Scene Animation");
 			uiDefIconButBitI(block, TOGN, ADS_FILTER_NOWOR, B_REDR, ICON_WORLD_DATA,	(short)(xco+=XIC),yco,XIC,YIC, &(ads->filterflag), 0, 0, 0, 0, "Display World Animation");

Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c	2009-10-13 23:15:34 UTC (rev 23817)
+++ trunk/blender/source/blender/editors/armature/poselib.c	2009-10-14 00:01:34 UTC (rev 23818)
@@ -436,13 +436,16 @@
 		return NULL;
 
 	memset(&item_tmp, 0, sizeof(item_tmp));
-
-	/* add each marker to the list */
-	for (marker=act->markers.first, i=0; marker; marker= marker->next, i++) {
-		item_tmp.identifier= item_tmp.name= marker->name;
-		item_tmp.icon= ICON_ARMATURE_DATA;
-		item_tmp.value= i;
-		RNA_enum_item_add(&item, &totitem, &item_tmp);
+	
+	/* check that the action exists */
+	if (act) {
+		/* add each marker to the list */
+		for (marker=act->markers.first, i=0; marker; marker= marker->next, i++) {
+			item_tmp.identifier= item_tmp.name= marker->name;
+			item_tmp.icon= ICON_ARMATURE_DATA;
+			item_tmp.value= i;
+			RNA_enum_item_add(&item, &totitem, &item_tmp);
+		}
 	}
 
 	if (i > 0) {