diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-11-18 14:40:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-18 14:40:55 +0300 |
commit | 67c295da9c471d5529398288f4b3ddc09a28b810 (patch) | |
tree | ca776357951967c5f50f4e263d1f1674a14ddd49 /source/blender/editors | |
parent | 95229aa6f513e8346578836bc384bccd14b8c472 (diff) |
rename pose_channels to bones
was: object.pose.pose_channels["Bone"]
now: object.pose.bones["Bone"]
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 6 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_ipo_utils.c | 4 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframing.c | 4 | ||||
-rw-r--r-- | source/blender/editors/animation/keyingsets.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/poseSlide.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_context.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 4 |
10 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index eab5404f106..eb3a0377711 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -779,13 +779,13 @@ static int animdata_filter_fcurves (ListBase *anim_data, bDopeSheet *ads, FCurve { Object *ob= (Object *)owner_id; - /* only consider if F-Curve involves pose_channels */ - if ((fcu->rna_path) && strstr(fcu->rna_path, "pose_channels")) { + /* only consider if F-Curve involves pose.bones */ + if ((fcu->rna_path) && strstr(fcu->rna_path, "bones")) { bPoseChannel *pchan; char *bone_name; /* get bone-name, and check if this bone is selected */ - bone_name= BLI_getQuotedStr(fcu->rna_path, "pose_channels["); + bone_name= BLI_getQuotedStr(fcu->rna_path, "bones["); pchan= get_pose_channel(ob->pose, bone_name); if (bone_name) MEM_freeN(bone_name); diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c index 98b6d0e7097..200c4eb3590 100644 --- a/source/blender/editors/animation/anim_ipo_utils.c +++ b/source/blender/editors/animation/anim_ipo_utils.c @@ -109,9 +109,9 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu) * - however, if we're showing subdata of bones (probably there will be other exceptions later) * need to include that info too since it gets confusing otherwise */ - if (strstr(fcu->rna_path, "pose_channels") && strstr(fcu->rna_path, "constraints")) { + if (strstr(fcu->rna_path, "bones") && strstr(fcu->rna_path, "constraints")) { /* perform string 'chopping' to get "Bone Name : Constraint Name" */ - char *pchanName= BLI_getQuotedStr(fcu->rna_path, "pose_channels["); + char *pchanName= BLI_getQuotedStr(fcu->rna_path, "bones["); char *constName= BLI_getQuotedStr(fcu->rna_path, "constraints["); /* assemble the string to display in the UI... */ diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 17a7dd91ed8..b400739e91c 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -511,7 +511,7 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop) con= ob->constraints.first; identifier= (char *)RNA_property_identifier(prop); } - else if (ptr->type == &RNA_PoseChannel) { + else if (ptr->type == &RNA_PoseBone) { /* Pose Channel */ bPoseChannel *pchan= (bPoseChannel *)ptr->data; @@ -622,7 +622,7 @@ static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_ } } } - else if (ptr->type == &RNA_PoseChannel) { + else if (ptr->type == &RNA_PoseBone) { Object *ob= (Object *)ptr->id.data; /* we assume that this is always set, and is an object */ bPoseChannel *pchan= (bPoseChannel *)ptr->data; float tmat[4][4]; diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 520247b77c1..bb3182b3d6e 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -1395,7 +1395,7 @@ int modify_keyframes (Scene *scene, ListBase *dsources, bAction *act, KeyingSet // FIXME: this currently only works with a few hardcoded cases if ((ksp->templates & KSP_TEMPLATE_PCHAN) && (cks->pchan)) { /* add basic pose-channel path access */ - BLI_dynstr_append(pathds, "pose.pose_channels[\""); + BLI_dynstr_append(pathds, "pose.bones[\""); BLI_dynstr_append(pathds, cks->pchan->name); BLI_dynstr_append(pathds, "\"]"); diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index a695095f133..320be365631 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -5411,7 +5411,7 @@ void ED_armature_bone_rename(bArmature *arm, char *oldnamep, char *newnamep) // TODO: should we be using the database wide version instead (since drivers may break) if (ob->adt) { /* posechannels only... */ - BKE_animdata_fix_paths_rename(&ob->id, ob->adt, "pose.pose_channels", oldname, newname); + BKE_animdata_fix_paths_rename(&ob->id, ob->adt, "pose.bones", oldname, newname); } } } diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index eb15d00c8ce..ac4cfd2c3e3 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -195,7 +195,7 @@ static int pose_slide_init (bContext *C, wmOperator *op, short mode) pfl->pchan= pchan; /* get the RNA path to this pchan - this needs to be freed! */ - RNA_pointer_create((ID *)pso->ob, &RNA_PoseChannel, pchan, &ptr); + RNA_pointer_create((ID *)pso->ob, &RNA_PoseBone, pchan, &ptr); pfl->pchan_path= RNA_path_from_ID_to_struct(&ptr); /* add linkage data to operator data */ diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index f1bc313d609..1ddc19a5ec0 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -200,7 +200,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult for (pchan= obact->pose->chanbase.first; pchan; pchan= pchan->next) { /* ensure that PoseChannel is on visible layer and is not hidden in PoseMode */ if ((pchan->bone) && (arm->layer & pchan->bone->layer) && !(pchan->bone->flag & BONE_HIDDEN_P)) { - CTX_data_list_add(result, &obact->id, &RNA_PoseChannel, pchan); + CTX_data_list_add(result, &obact->id, &RNA_PoseBone, pchan); } } @@ -216,7 +216,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult /* ensure that PoseChannel is on visible layer and is not hidden in PoseMode */ if ((pchan->bone) && (arm->layer & pchan->bone->layer) && !(pchan->bone->flag & BONE_HIDDEN_P)) { if (pchan->bone->flag & BONE_SELECTED || pchan->bone == arm->act_bone) - CTX_data_list_add(result, &obact->id, &RNA_PoseChannel, pchan); + CTX_data_list_add(result, &obact->id, &RNA_PoseBone, pchan); } } @@ -245,7 +245,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult pchan= get_active_posechannel(obact); if (pchan) { - CTX_data_pointer_set(result, &obact->id, &RNA_PoseChannel, pchan); + CTX_data_pointer_set(result, &obact->id, &RNA_PoseBone, pchan); return 1; } } diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index b52365145ac..a77ba68dc24 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -72,7 +72,7 @@ void node_operatortypes(void) void node_keymap(struct wmKeyConfig *keyconf) { wmKeyMap *keymap; - wmKeyMapItem *kmi; +// wmKeyMapItem *kmi; /* Entire Editor only ----------------- */ keymap= WM_keymap_find(keyconf, "Node Generic", SPACE_NODE, 0); diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 08629a9a2f7..d8c2fb9d43e 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1560,7 +1560,7 @@ static void bone_matrix_translate_y(float mat[][4], float y) } /* assumes object is Armature with pose */ -static void draw_pose_channels(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt) +static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt) { RegionView3D *rv3d= ar->regiondata; Object *ob= base->object; @@ -2380,7 +2380,7 @@ static void draw_ghost_poses_range(Scene *scene, View3D *v3d, ARegion *ar, Base BKE_animsys_evaluate_animdata(&ob->id, adt, (float)CFRA, ADT_RECALC_ALL); where_is_pose(scene, ob); - draw_pose_channels(scene, v3d, ar, base, OB_WIRE); + draw_pose_bones(scene, v3d, ar, base, OB_WIRE); } glDisable(GL_BLEND); if (v3d->zbuf) glEnable(GL_DEPTH_TEST); @@ -2459,7 +2459,7 @@ static void draw_ghost_poses_keys(Scene *scene, View3D *v3d, ARegion *ar, Base * BKE_animsys_evaluate_animdata(&ob->id, adt, (float)CFRA, ADT_RECALC_ALL); where_is_pose(scene, ob); - draw_pose_channels(scene, v3d, ar, base, OB_WIRE); + draw_pose_bones(scene, v3d, ar, base, OB_WIRE); } glDisable(GL_BLEND); if (v3d->zbuf) glEnable(GL_DEPTH_TEST); @@ -2529,7 +2529,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base) if (CFRA != cfrao) { BKE_animsys_evaluate_animdata(&ob->id, adt, (float)CFRA, ADT_RECALC_ALL); where_is_pose(scene, ob); - draw_pose_channels(scene, v3d, ar, base, OB_WIRE); + draw_pose_bones(scene, v3d, ar, base, OB_WIRE); } } @@ -2544,7 +2544,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base) if (CFRA != cfrao) { BKE_animsys_evaluate_animdata(&ob->id, adt, (float)CFRA, ADT_RECALC_ALL); where_is_pose(scene, ob); - draw_pose_channels(scene, v3d, ar, base, OB_WIRE); + draw_pose_bones(scene, v3d, ar, base, OB_WIRE); } } } @@ -2627,7 +2627,7 @@ int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, in } } } - draw_pose_channels(scene, v3d, ar, base, dt); + draw_pose_bones(scene, v3d, ar, base, dt); arm->flag &= ~ARM_POSEMODE; if(ob->mode & OB_MODE_POSE) diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index d3a922af67e..0eddeba6ff9 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -504,7 +504,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr) split = uiLayoutSplit(layout, 0.8); - if (ptr->type == &RNA_PoseChannel) { + if (ptr->type == &RNA_PoseBone) { PointerRNA boneptr; Bone *bone; @@ -591,7 +591,7 @@ static void v3d_posearmature_buts(uiLayout *layout, View3D *v3d, Object *ob, flo return; } - RNA_pointer_create(&ob->id, &RNA_PoseChannel, pchan, &pchanptr); + RNA_pointer_create(&ob->id, &RNA_PoseBone, pchan, &pchanptr); col= uiLayoutColumn(layout, 0); |