rename pose_channels to bones
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 Nov 2009 11:40:55 +0000 (11:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 Nov 2009 11:40:55 +0000 (11:40 +0000)
was: object.pose.pose_channels["Bone"]
now: object.pose.bones["Bone"]

22 files changed:
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/ipo.c
source/blender/collada/DocumentImporter.cpp
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/anim_ipo_utils.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/poseSlide.c
source/blender/editors/screen/screen_context.c
source/blender/editors/space_node/node_ops.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_scene.c
source/gameengine/Converter/BL_ArmatureConstraint.cpp

index c72a212ae326ff6d9d1609be96a24708d706521f..33f3658c53b14e3e1ebc5c8eaeab42c4d272a44f 100644 (file)
@@ -868,7 +868,7 @@ short action_get_item_transforms (bAction *act, Object *ob, bPoseChannel *pchan,
        
        /* build PointerRNA from provided data to obtain the paths to use */
        if (pchan)
        
        /* build PointerRNA from provided data to obtain the paths to use */
        if (pchan)
-               RNA_pointer_create((ID *)ob, &RNA_PoseChannel, pchan, &ptr);
+               RNA_pointer_create((ID *)ob, &RNA_PoseBone, pchan, &ptr);
        else if (ob)
                RNA_id_pointer_create((ID *)ob, &ptr);
        else    
        else if (ob)
                RNA_id_pointer_create((ID *)ob, &ptr);
        else    
index e28498258626b306adbb8e4d256ec3ab39849859..5ebcec63cd4d271821e1fd28f71285e326b0bd20 100644 (file)
@@ -353,7 +353,7 @@ static void nlastrips_path_rename_fix (ID *owner_id, char *prefix, char *oldName
 
 /* Fix all RNA-Paths in the AnimData block used by the given ID block
  * NOTE: it is assumed that the structure we're replacing is <prefix><["><name><"]>
 
 /* Fix all RNA-Paths in the AnimData block used by the given ID block
  * NOTE: it is assumed that the structure we're replacing is <prefix><["><name><"]>
- *             i.e. pose.pose_channels["Bone"]
+ *             i.e. pose.bones["Bone"]
  */
 void BKE_animdata_fix_paths_rename (ID *owner_id, AnimData *adt, char *prefix, char *oldName, char *newName)
 {
  */
 void BKE_animdata_fix_paths_rename (ID *owner_id, AnimData *adt, char *prefix, char *oldName, char *newName)
 {
@@ -388,7 +388,7 @@ void BKE_animdata_fix_paths_rename (ID *owner_id, AnimData *adt, char *prefix, c
 
 /* Fix all RNA-Paths throughout the database (directly access the Global.main version)
  * NOTE: it is assumed that the structure we're replacing is <prefix><["><name><"]>
 
 /* Fix all RNA-Paths throughout the database (directly access the Global.main version)
  * NOTE: it is assumed that the structure we're replacing is <prefix><["><name><"]>
- *             i.e. pose.pose_channels["Bone"]
+ *             i.e. pose.bones["Bone"]
  */
 void BKE_all_animdata_fix_paths_rename (char *prefix, char *oldName, char *newName)
 {
  */
 void BKE_all_animdata_fix_paths_rename (char *prefix, char *oldName, char *newName)
 {
index 8b848ac53712693435abfd96ffcd657faee7afaf..302b81f2a047af78b5cae26fc140b3c224db82ad 100644 (file)
@@ -327,7 +327,7 @@ static void dag_add_driver_relation(AnimData *adt, DagForest *dag, DagNode *node
                                        node1 = dag_get_node(dag, dtar->id);
                                        
                                        /* check if bone... */
                                        node1 = dag_get_node(dag, dtar->id);
                                        
                                        /* check if bone... */
-                                       if ((ob->type==OB_ARMATURE) && dtar->rna_path && strstr(dtar->rna_path, "pose.pose_channels["))
+                                       if ((ob->type==OB_ARMATURE) && dtar->rna_path && strstr(dtar->rna_path, "pose.bones["))
                                                dag_add_relation(dag, node1, node, isdata?DAG_RL_DATA_DATA:DAG_RL_DATA_OB, "Driver");
                                        /* check if ob data */
                                        else if (dtar->rna_path && strstr(dtar->rna_path, "data."))
                                                dag_add_relation(dag, node1, node, isdata?DAG_RL_DATA_DATA:DAG_RL_DATA_OB, "Driver");
                                        /* check if ob data */
                                        else if (dtar->rna_path && strstr(dtar->rna_path, "data."))
index 40328c876bec52e32b19acad0eaa3cb80d61e52e..c451168a005494615d0275259612993365708eef 100644 (file)
@@ -881,7 +881,7 @@ static void driver_get_target_pchans2 (ChannelDriver *driver, bPoseChannel **pch
                /* resolve path so that we have pointer to the right posechannel */
                if (RNA_path_resolve(&id_ptr, dtar->rna_path, &ptr, &prop)) {
                        /* is pointer valid (i.e. pointing to an actual posechannel */
                /* resolve path so that we have pointer to the right posechannel */
                if (RNA_path_resolve(&id_ptr, dtar->rna_path, &ptr, &prop)) {
                        /* is pointer valid (i.e. pointing to an actual posechannel */
-                       if ((ptr.type == &RNA_PoseChannel) && (ptr.data)) {
+                       if ((ptr.type == &RNA_PoseBone) && (ptr.data)) {
                                /* first or second target? */
                                if (i)
                                        *pchan1= ptr.data;
                                /* first or second target? */
                                if (i)
                                        *pchan1= ptr.data;
index 9e9a171995237f79f025f5025ec5128e6113395c..18a8210c68d294e5700e8237d3444c960ec86b8d 100644 (file)
@@ -919,11 +919,11 @@ static char *get_rna_access (int blocktype, int adrcode, char actname[], char co
        /* append preceeding bits to path */
        if ((actname && actname[0]) && (constname && constname[0])) {
                /* Constraint in Pose-Channel */
        /* append preceeding bits to path */
        if ((actname && actname[0]) && (constname && constname[0])) {
                /* Constraint in Pose-Channel */
-               sprintf(buf, "pose.pose_channels[\"%s\"].constraints[\"%s\"]", actname, constname);
+               sprintf(buf, "pose.bones[\"%s\"].constraints[\"%s\"]", actname, constname);
        }
        else if (actname && actname[0]) {
                /* Pose-Channel */
        }
        else if (actname && actname[0]) {
                /* Pose-Channel */
-               sprintf(buf, "pose.pose_channels[\"%s\"]", actname);
+               sprintf(buf, "pose.bones[\"%s\"]", actname);
        }
        else if (constname && constname[0]) {
                /* Constraint in Object */
        }
        else if (constname && constname[0]) {
                /* Constraint in Object */
index f03ac47effdcfbc80c1d4e2a91cfb6ba637a955b..83f0debb60dcc91f624ae5ed30fc91ed3b8a9423 100644 (file)
@@ -989,7 +989,7 @@ public:
 
        void get_rna_path_for_joint(COLLADAFW::Node *node, char *joint_path, size_t count)
        {
 
        void get_rna_path_for_joint(COLLADAFW::Node *node, char *joint_path, size_t count)
        {
-               BLI_snprintf(joint_path, count, "pose.pose_channels[\"%s\"]", get_joint_name(node));
+               BLI_snprintf(joint_path, count, "pose.bones[\"%s\"]", get_joint_name(node));
        }
        
        void fix_animation()
        }
        
        void fix_animation()
@@ -1979,7 +1979,7 @@ public:
                        return true;
                }
 
                        return true;
                }
 
-               // for bones rna_path is like: pose.pose_channels["bone-name"].rotation
+               // for bones rna_path is like: pose.bones["bone-name"].rotation
                
                // what does this AnimationList animate?
                Animation& animated = uid_animated_map[anim_list_id];
                
                // what does this AnimationList animate?
                Animation& animated = uid_animated_map[anim_list_id];
@@ -2165,7 +2165,7 @@ public:
                        char joint_path[100];
                        char rna_path[100];
 
                        char joint_path[100];
                        char rna_path[100];
 
-                       BLI_snprintf(joint_path, sizeof(joint_path), "pose.pose_channels[\"%s\"]", grp->name);
+                       BLI_snprintf(joint_path, sizeof(joint_path), "pose.bones[\"%s\"]", grp->name);
                        BLI_snprintf(rna_path, sizeof(rna_path), "%s.rotation_euler", joint_path);
 
                        FCurve *quatcu[4] = {
                        BLI_snprintf(rna_path, sizeof(rna_path), "%s.rotation_euler", joint_path);
 
                        FCurve *quatcu[4] = {
index eab5404f10648ba4acced8607e86498944a99f21..eb3a03777118156f7886f2658e7d61fc2746e4bc 100644 (file)
@@ -779,13 +779,13 @@ static int animdata_filter_fcurves (ListBase *anim_data, bDopeSheet *ads, FCurve
                {
                        Object *ob= (Object *)owner_id;
                        
                {
                        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 */
                                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);
                                
                                pchan= get_pose_channel(ob->pose, bone_name);
                                if (bone_name) MEM_freeN(bone_name);
                                
index 98b6d0e709756c16ce8a4f342dde7b8f0540326f..200c4eb3590fea454077c426c1f2c6bf43c1b16f 100644 (file)
@@ -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
                         */
                         *      - 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" */
                                /* 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... */
                                char *constName= BLI_getQuotedStr(fcu->rna_path, "constraints[");
                                
                                /* assemble the string to display in the UI... */
index 17a7dd91ed8ee5fa3ee9e0ae16787bb67cdf8a38..b400739e91c0ce54b312cdcce2e4c612c0fdfc88 100644 (file)
@@ -511,7 +511,7 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
                con= ob->constraints.first;
                identifier= (char *)RNA_property_identifier(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;
                
                /* 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];
                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];
index 520247b77c12e11c11342b9795db13225bf10991..bb3182b3d6e869e389dc6bd2e04578f6527cb073 100644 (file)
@@ -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 */
                                // 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, "\"]");
                                        
                                        BLI_dynstr_append(pathds, cks->pchan->name);
                                        BLI_dynstr_append(pathds, "\"]");
                                        
index a695095f133e45a88dfcad3f37966bbc3a920a6c..320be365631483e9232a0df5b15204e4b9626fc9 100644 (file)
@@ -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... */
                        // 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);
                        }
                }
        }
                        }
                }
        }
index eb15d00c8cea0aa21f758c869b22afdda3ad06bb..ac4cfd2c3e3ec1a7a833c0a6a9836a375682d1d4 100644 (file)
@@ -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! */
                        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 */
                        pfl->pchan_path= RNA_path_from_ID_to_struct(&ptr);
                        
                        /* add linkage data to operator data */
index f1bc313d6095002bc09a1b40b3dd50acf53ee69a..1ddc19a5ec0c853cdb654046c3a2fe1d787c14aa 100644 (file)
@@ -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)) {
                        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)
                                /* 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) {
                
                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;
                }
        }
                        return 1;
                }
        }
index b52365145ac9ef6a43b71afa2f5307d07a668838..a77ba68dc242a7431ebe0ed3f4e3460e923fd345 100644 (file)
@@ -72,7 +72,7 @@ void node_operatortypes(void)
 void node_keymap(struct wmKeyConfig *keyconf)
 {
        wmKeyMap *keymap;
 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);
        
        /* Entire Editor only ----------------- */
        keymap= WM_keymap_find(keyconf, "Node Generic", SPACE_NODE, 0);
index 08629a9a2f7d9c2add572cfcc4c7df407cc09398..d8c2fb9d43e359d99704ae7e3c25d03a51f16801 100644 (file)
@@ -1560,7 +1560,7 @@ static void bone_matrix_translate_y(float mat[][4], float y)
 }
 
 /* assumes object is Armature with pose */
 }
 
 /* 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;
 {
        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);
                
                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);
        }
        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);
                
                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);
        }
        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);
                        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);
                        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)
                        arm->flag &= ~ARM_POSEMODE; 
                        
                        if(ob->mode & OB_MODE_POSE)
index d3a922af67efd5c2a3f324b78170bf65bf670de8..0eddeba6ff9fd41369bea936e6b8e727fedc2093 100644 (file)
@@ -504,7 +504,7 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr)
        
        split = uiLayoutSplit(layout, 0.8);
        
        
        split = uiLayoutSplit(layout, 0.8);
        
-       if (ptr->type == &RNA_PoseChannel) {
+       if (ptr->type == &RNA_PoseBone) {
                PointerRNA boneptr;
                Bone *bone;
                
                PointerRNA boneptr;
                Bone *bone;
                
@@ -591,7 +591,7 @@ static void v3d_posearmature_buts(uiLayout *layout, View3D *v3d, Object *ob, flo
                return; 
        }
 
                return; 
        }
 
-       RNA_pointer_create(&ob->id, &RNA_PoseChannel, pchan, &pchanptr);
+       RNA_pointer_create(&ob->id, &RNA_PoseBone, pchan, &pchanptr);
 
        col= uiLayoutColumn(layout, 0);
        
 
        col= uiLayoutColumn(layout, 0);
        
index 64e9d62a839fad1f1ea65b92094da7eda52c7af2..a8c567dccf424bf49b6137a72d0ff7417c808bbd 100644 (file)
@@ -347,7 +347,7 @@ extern StructRNA RNA_PointDensityTexture;
 extern StructRNA RNA_PointLamp;
 extern StructRNA RNA_PointerProperty;
 extern StructRNA RNA_Pose;
 extern StructRNA RNA_PointLamp;
 extern StructRNA RNA_PointerProperty;
 extern StructRNA RNA_Pose;
-extern StructRNA RNA_PoseChannel;
+extern StructRNA RNA_PoseBone;
 extern StructRNA RNA_Property;
 extern StructRNA RNA_PropertySensor;
 extern StructRNA RNA_PythonConstraint;
 extern StructRNA RNA_Property;
 extern StructRNA RNA_PropertySensor;
 extern StructRNA RNA_PythonConstraint;
index 847ce551e911b0325f7812de123c3b3af613f648..4d11614c1e8b299ff3ca2d098761d2dd2d22cdd7 100644 (file)
@@ -193,7 +193,7 @@ static char *rna_Constraint_path(PointerRNA *ptr)
        
        /* if constraint is in the list, the list is for the active bone... */
        if ((inList) && (actlist != &ob->constraints) && (pchan))
        
        /* if constraint is in the list, the list is for the active bone... */
        if ((inList) && (actlist != &ob->constraints) && (pchan))
-               return BLI_sprintfN("pose.pose_channels[\"%s\"].constraints[\"%s\"]", pchan->name, con->name);
+               return BLI_sprintfN("pose.bones[\"%s\"].constraints[\"%s\"]", pchan->name, con->name);
        else
                return BLI_sprintfN("constraints[\"%s\"]", con->name);
 }
        else
                return BLI_sprintfN("constraints[\"%s\"]", con->name);
 }
index a068dc7cb26be171513248576f1ea16849d966e3..82988a06af967405ab76a02b788cdb490acd31e2 100644 (file)
@@ -129,11 +129,13 @@ static void rna_Main_camera_begin(CollectionPropertyIterator *iter, PointerRNA *
        rna_iterator_listbase_begin(iter, &bmain->camera, NULL);
 }
 
        rna_iterator_listbase_begin(iter, &bmain->camera, NULL);
 }
 
+#if 0
 static void rna_Main_key_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
        Main *bmain= (Main*)ptr->data;
        rna_iterator_listbase_begin(iter, &bmain->key, NULL);
 }
 static void rna_Main_key_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
        Main *bmain= (Main*)ptr->data;
        rna_iterator_listbase_begin(iter, &bmain->key, NULL);
 }
+#endif
 
 static void rna_Main_world_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
 
 static void rna_Main_world_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
index ae912c6d7c616f11a098d7bfa0cc3c384ad9abcb..1d4909a618fd0fc8ca9557a4828886d3adc5c8dd 100644 (file)
@@ -74,9 +74,9 @@ static void rna_Pose_IK_update(bContext *C, PointerRNA *ptr)
        BIK_clear_data(ob->pose);
 }
 
        BIK_clear_data(ob->pose);
 }
 
-static char *rna_PoseChannel_path(PointerRNA *ptr)
+static char *rna_PoseBone_path(PointerRNA *ptr)
 {
 {
-       return BLI_sprintfN("pose.pose_channels[\"%s\"]", ((bPoseChannel*)ptr->data)->name);
+       return BLI_sprintfN("pose.bones[\"%s\"]", ((bPoseChannel*)ptr->data)->name);
 }
 
 static void rna_BoneGroup_color_set_set(PointerRNA *ptr, int value)
 }
 
 static void rna_BoneGroup_color_set_set(PointerRNA *ptr, int value)
@@ -114,7 +114,7 @@ static void rna_BoneGroup_color_set_set(PointerRNA *ptr, int value)
        }
 }
 
        }
 }
 
-static IDProperty *rna_PoseChannel_idproperties(PointerRNA *ptr, int create)
+static IDProperty *rna_PoseBone_idproperties(PointerRNA *ptr, int create)
 {
        bPoseChannel *pchan= ptr->data;
 
 {
        bPoseChannel *pchan= ptr->data;
 
@@ -578,11 +578,11 @@ static void rna_def_pose_channel(BlenderRNA *brna)
        StructRNA *srna;
        PropertyRNA *prop;
 
        StructRNA *srna;
        PropertyRNA *prop;
 
-       srna= RNA_def_struct(brna, "PoseChannel", NULL);
+       srna= RNA_def_struct(brna, "PoseBone", NULL);
        RNA_def_struct_sdna(srna, "bPoseChannel");
        RNA_def_struct_sdna(srna, "bPoseChannel");
-       RNA_def_struct_ui_text(srna, "Pose Channel", "Channel defining pose data for a bone in a Pose.");
-       RNA_def_struct_path_func(srna, "rna_PoseChannel_path");
-       RNA_def_struct_idproperties_func(srna, "rna_PoseChannel_idproperties");
+       RNA_def_struct_ui_text(srna, "Pose Bone", "Channel defining pose data for a bone in a Pose.");
+       RNA_def_struct_path_func(srna, "rna_PoseBone_path");
+       RNA_def_struct_idproperties_func(srna, "rna_PoseBone_idproperties");
        
        /* Bone Constraints */
        prop= RNA_def_property(srna, "constraints", PROP_COLLECTION, PROP_NONE);
        
        /* Bone Constraints */
        prop= RNA_def_property(srna, "constraints", PROP_COLLECTION, PROP_NONE);
@@ -619,17 +619,17 @@ static void rna_def_pose_channel(BlenderRNA *brna)
        RNA_def_property_flag(prop, PROP_NEVER_NULL);
        RNA_def_property_struct_type(prop, "Bone");
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
        RNA_def_property_flag(prop, PROP_NEVER_NULL);
        RNA_def_property_struct_type(prop, "Bone");
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "Bone", "Bone associated with this Pose Channel.");
+       RNA_def_property_ui_text(prop, "Bone", "Bone associated with this PoseBone.");
 
        prop= RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE);
 
        prop= RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE);
-       RNA_def_property_struct_type(prop, "PoseChannel");
+       RNA_def_property_struct_type(prop, "PoseBone");
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "Parent", "Parent of this pose channel.");
+       RNA_def_property_ui_text(prop, "Parent", "Parent of this pose bone.");
 
        prop= RNA_def_property(srna, "child", PROP_POINTER, PROP_NONE);
 
        prop= RNA_def_property(srna, "child", PROP_POINTER, PROP_NONE);
-       RNA_def_property_struct_type(prop, "PoseChannel");
+       RNA_def_property_struct_type(prop, "PoseBone");
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "Child", "Child of this pose channel.");
+       RNA_def_property_ui_text(prop, "Child", "Child of this pose bone.");
        
        /* Transformation settings */
        prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);
        
        /* Transformation settings */
        prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);
@@ -997,10 +997,10 @@ static void rna_def_pose(BlenderRNA *brna)
        RNA_def_struct_ui_text(srna, "Pose", "A collection of pose channels, including settings for animating bones.");
 
        /* pose channels */
        RNA_def_struct_ui_text(srna, "Pose", "A collection of pose channels, including settings for animating bones.");
 
        /* pose channels */
-       prop= RNA_def_property(srna, "pose_channels", PROP_COLLECTION, PROP_NONE);
+       prop= RNA_def_property(srna, "bones", PROP_COLLECTION, PROP_NONE);
        RNA_def_property_collection_sdna(prop, NULL, "chanbase", NULL);
        RNA_def_property_collection_sdna(prop, NULL, "chanbase", NULL);
-       RNA_def_property_struct_type(prop, "PoseChannel");
-       RNA_def_property_ui_text(prop, "Pose Channels", "Individual pose channels for the armature.");
+       RNA_def_property_struct_type(prop, "PoseBone");
+       RNA_def_property_ui_text(prop, "Pose Bones", "Individual pose bones for the armature.");
 
        /* bone groups */
        prop= RNA_def_property(srna, "bone_groups", PROP_COLLECTION, PROP_NONE);
 
        /* bone groups */
        prop= RNA_def_property(srna, "bone_groups", PROP_COLLECTION, PROP_NONE);
index 6bb8001ffb071adb45c75eaaffd23f31d1e13a6f..b9f5d64333f1707d259c0b3635e0567cc761a6a5 100644 (file)
@@ -2176,8 +2176,8 @@ static void rna_def_scene_objects(BlenderRNA *brna, PropertyRNA *cprop)
        StructRNA *srna;
        PropertyRNA *prop;
 
        StructRNA *srna;
        PropertyRNA *prop;
 
-       FunctionRNA *func;
-       PropertyRNA *parm;
+//     FunctionRNA *func;
+//     PropertyRNA *parm;
        
        RNA_def_property_srna(cprop, "SceneObjects");
        srna= RNA_def_struct(brna, "SceneObjects", NULL);
        
        RNA_def_property_srna(cprop, "SceneObjects");
        srna= RNA_def_struct(brna, "SceneObjects", NULL);
@@ -2245,7 +2245,7 @@ void RNA_def_scene(BlenderRNA *brna)
 {
        StructRNA *srna;
        PropertyRNA *prop;
 {
        StructRNA *srna;
        PropertyRNA *prop;
-       PropertyRNA *prop_act;
+//     PropertyRNA *prop_act;
        FunctionRNA *func;
        
        static EnumPropertyItem audio_distance_model_items[] = {
        FunctionRNA *func;
        
        static EnumPropertyItem audio_distance_model_items[] = {
index c37f963b82fecc423eabd2bf3ca9afb8fc037ae5..1f975f657b815c25263b4eec0defea500e6f4e54 100644 (file)
@@ -359,7 +359,7 @@ int BL_ArmatureConstraint::py_attr_setattr(void *self_v, const struct KX_PYATTRI
        int attr_order = attrdef-Attributes;
        int ival;
        double dval;
        int attr_order = attrdef-Attributes;
        int ival;
        double dval;
-       char* sval;
+//     char* sval;
        KX_GameObject *oval;
 
        if (!constraint) {
        KX_GameObject *oval;
 
        if (!constraint) {