From 3367ef8b6591b62b1b76f07fccb310485f6d45c7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 31 Oct 2010 15:39:37 +0000 Subject: initialize structs to zero rather then using memset(). --- source/blender/editors/armature/poselib.c | 7 ++----- source/blender/editors/armature/poseobject.c | 10 +++------- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'source/blender/editors/armature') diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index a595396b15d..d1430808fca 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -407,15 +407,13 @@ static EnumPropertyItem *poselib_stored_pose_itemf(bContext *C, PointerRNA *UNUS Object *ob= ED_object_pose_armature(CTX_data_active_object(C)); bAction *act= (ob) ? ob->poselib : NULL; TimeMarker *marker; - EnumPropertyItem *item= NULL, item_tmp; + EnumPropertyItem *item= NULL, item_tmp= {0}; int totitem= 0; int i= 0; if (C==NULL) { return DummyRNA_DEFAULT_items; } - - memset(&item_tmp, 0, sizeof(item_tmp)); /* check that the action exists */ if (act) { @@ -708,7 +706,7 @@ static void poselib_apply_pose (tPoseLib_PreviewData *pld) bAction *act= pld->act; bActionGroup *agrp; - KeyframeEditData ked; + KeyframeEditData ked= {{0}}; KeyframeEditFunc group_ok_cb; int frame= 1; @@ -721,7 +719,6 @@ static void poselib_apply_pose (tPoseLib_PreviewData *pld) /* init settings for testing groups for keyframes */ group_ok_cb= ANIM_editkeyframes_ok(BEZT_OK_FRAMERANGE); - memset(&ked, 0, sizeof(KeyframeEditData)); ked.f1= ((float)frame) - 0.5f; ked.f2= ((float)frame) + 0.5f; diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index ecb34609b2d..217a83c3b31 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -1682,11 +1682,9 @@ void ARMATURE_OT_armature_layers (wmOperatorType *ot) /* Present a popup to get the layers that should be used */ static int pose_bone_layers_invoke (bContext *C, wmOperator *op, wmEvent *evt) { - int layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ - - /* get layers that are active already */ - memset(&layers, 0, sizeof(layers)); /* set all layers to be off by default */ + int layers[32]= {0}; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + /* get layers that are active already */ CTX_DATA_BEGIN(C, bPoseChannel *, pchan, selected_pose_bones) { short bit; @@ -1756,11 +1754,9 @@ void POSE_OT_bone_layers (wmOperatorType *ot) /* Present a popup to get the layers that should be used */ static int armature_bone_layers_invoke (bContext *C, wmOperator *op, wmEvent *evt) { - int layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + int layers[32]= {0}; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ /* get layers that are active already */ - memset(&layers, 0, sizeof(layers)); /* set all layers to be off by default */ - CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones) { short bit; -- cgit v1.2.3