bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Assorted code cleanups:

Browse Source 
* Removed some un-needed armature code stubs
* Manually copying over the values of constraints in the constraint copy() callbacks should NOT be needed. Removed this from the Spline IK constraint. The manual process is only a hacky aspect of the modifier stack only!
This commit is contained in:
Joshua Leung 2010-04-26 06:35:25 +00:00
parent b5d28306d0
commit 4980e43dd1
3 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/constraint.c
View File

@ -3751,10 +3751,6 @@ static void splineik_copy (bConstraint *con, bConstraint *srccon)
/* copy the binding array */
dst->points= MEM_dupallocN(src->points);
dst->numpoints= src->numpoints;
dst->chainlen= src->chainlen;
dst->flag= src->flag;
dst->xzScaleMode= src->xzScaleMode;
}
static void splineik_new_data (void *cdata)

27
source/blender/editors/armature/editarmature.c
View File

@ -88,7 +88,6 @@
#endif
/* ************* XXX *************** */
static int okee(const char *dummy) {return 0;}
static void BIF_undo_push(const char *msg) {}
/* ************* XXX *************** */
@ -140,7 +139,7 @@ static void bone_free(bArmature *arm, EditBone *bone)
BLI_freelinkN(arm->edbo, bone);
}
void ED_armature_edit_bone_remove(bArmature *arm, EditBone* exBone)
void ED_armature_edit_bone_remove(bArmature *arm, EditBone *exBone)
{
EditBone *curBone;
@ -477,9 +476,10 @@ void docenter_armature (Scene *scene, View3D *v3d, Object *ob, int centermode)
/* ---------------------- */
static EditBone *editbone_name_exists (ListBase *edbo, char *name)
/* checks if an EditBone with a matching name already, returning the matching bone if it exists */
static EditBone *editbone_name_exists (ListBase *edbo, const char *name)
{
EditBone *eBone;
EditBone *eBone;
for (eBone=edbo->first; eBone; eBone=eBone->next) {
if (!strcmp(name, eBone->name))
@ -492,9 +492,9 @@ static EditBone *editbone_name_exists (ListBase *edbo, char *name)
void unique_editbone_name (ListBase *edbo, char *name, EditBone *bone)
{
EditBone *dupli;
char tempname[64];
int number;
char *dot;
char tempname[64];
int number;
char *dot;
dupli = editbone_name_exists(edbo, name);
@ -1925,10 +1925,6 @@ void ED_armature_deselectall(Object *obedit, int toggle, int doundo)
}
ED_armature_sync_selection(arm->edbo);
if (doundo) {
if (sel==1) BIF_undo_push("Select All");
else BIF_undo_push("Deselect All");
}
}
@ -2033,15 +2029,6 @@ void ED_armature_edit_free(struct Object *ob)
}
}
void ED_armature_edit_remake(Object *obedit)
{
if(okee("Reload original data")==0) return;
ED_armature_to_edit(obedit);
// BIF_undo_push("Delete bone");
}
/* Put armature in EditMode */
void ED_armature_to_edit(Object *ob)
{

1
source/blender/editors/include/ED_armature.h
View File

@ -102,7 +102,6 @@ void ED_keymap_armature(struct wmKeyConfig *keyconf);
void ED_armature_from_edit(struct Object *obedit);
void ED_armature_to_edit(struct Object *ob);
void ED_armature_edit_free(struct Object *ob);
void ED_armature_edit_remake(struct Object *obedit);
void ED_armature_deselectall(struct Object *obedit, int toggle, int doundo);
int ED_do_pose_selectbuffer(struct Scene *scene, struct Base *base, unsigned int *buffer,