griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix #5230

Browse Source 
Vertex Parent option didn't have index correction for editing Meshes.
That caused the parenting to flip around when you deleted or added stuff.
This commit is contained in:
Ton Roosendaal
2006-11-15 11:10:00 +00:00
parent a3c1c543f6
commit e50112d441
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/object.c
View File

@@ -1308,11 +1308,8 @@ static void give_parvert(Object *par, int nr, float *vec)
EditMesh *em = G.editMesh;
EditVert *eve;
if(nr >= G.totvert) nr= 0;
count= 0;
for(eve= em->verts.first; eve; eve= eve->next, count++) {
if(count==nr) {
for(eve= em->verts.first; eve; eve= eve->next) {
if(eve->keyindex==nr) {
memcpy(vec, eve->co, 12);
break;
}

27
source/blender/src/editmesh.c
View File

@@ -1197,7 +1197,7 @@ void load_editMesh(void)
me->mcol = CustomData_get(&mfdata, 0, LAYERTYPE_MCOL);
CustomData_free(&mfdata);
/* patch hook indices */
/* patch hook indices and vertex parents */
{
Object *ob;
ModifierData *md;
@@ -1205,6 +1205,31 @@ void load_editMesh(void)
int i,j;
for (ob=G.main->object.first; ob; ob=ob->id.next) {
if (ob->parent==G.obedit && ELEM(ob->partype, PARVERT1,PARVERT3)) {
/* duplicate code from below, make it function later...? */
if (!vertMap) {
vertMap = MEM_callocN(sizeof(*vertMap)*ototvert, "vertMap");
for (eve=em->verts.first; eve; eve=eve->next) {
if (eve->keyindex!=-1)
vertMap[eve->keyindex] = eve;
}
}
if(ob->par1 < ototvert) {
eve = vertMap[ob->par1];
if(eve) ob->par1= eve->tmp.l;
}
if(ob->par2 < ototvert) {
eve = vertMap[ob->par2];
if(eve) ob->par2= eve->tmp.l;
}
if(ob->par3 < ototvert) {
eve = vertMap[ob->par3];
if(eve) ob->par3= eve->tmp.l;
}
}
if (ob->data==me) {
for (md=ob->modifiers.first; md; md=md->next) {
if (md->type==eModifierType_Hook) {