forked from bartvdbraak/blender
Bug fix #2512
When joining Meshes, with the active on having TFaces, and other Meshes not, the new TFaces were created but not initialized.
This commit is contained in:
parent
2887e68705
commit
799d7e3f98
@ -83,6 +83,7 @@ void sort_faces(void);
|
|||||||
#include "BIF_editconstraint.h"
|
#include "BIF_editconstraint.h"
|
||||||
|
|
||||||
#include "BDR_editobject.h"
|
#include "BDR_editobject.h"
|
||||||
|
#include "BDR_editface.h"
|
||||||
|
|
||||||
#include "mydevice.h"
|
#include "mydevice.h"
|
||||||
#include "blendef.h"
|
#include "blendef.h"
|
||||||
@ -350,9 +351,16 @@ void join_mesh(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(tfacemain) {
|
if(tfacemain) {
|
||||||
if(me->tface) memcpy(tface, me->tface, me->totface*sizeof(TFace));
|
if(me->tface) {
|
||||||
|
memcpy(tface, me->tface, me->totface*sizeof(TFace));
|
||||||
tface+= me->totface;
|
tface+= me->totface;
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
for(a=0; a<me->totface; a++, tface++) {
|
||||||
|
default_tface(tface);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user