diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-10-14 04:01:34 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-10-14 04:01:34 +0400 |
| commit | adddfffe231b066ed701852b6a378f2f7561d7a4 (patch) | |
| tree | 0a130cc03272758b987b1246ac36f36811d8ba82 /source | |
| parent | a9cf4bbf023fb58280d6f8b79b99d694af4d9ff6 (diff) | |
* Fixed crash with operator cheat-sheet
* Removed obsolete comment
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/armature/poselib.c | 17 |
2 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 9863006308e..2dc4aa09407 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -340,7 +340,6 @@ short ANIM_headerUI_standard_buttons (const bContext *C, bDopeSheet *ads, uiBloc 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"); diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index b06c7286859..d6f93757505 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -436,13 +436,16 @@ static EnumPropertyItem *poselib_stored_pose_itemf(bContext *C, PointerRNA *ptr, 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) { |