From 799d7e3f981c59cd54ccbedcde44760ac63133d0 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 5 May 2005 20:56:05 +0000 Subject: [PATCH] Bug fix #2512 When joining Meshes, with the active on having TFaces, and other Meshes not, the new TFaces were created but not initialized. --- source/blender/src/meshtools.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index cf5bbb7d2bb..df1ac2c1797 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -83,6 +83,7 @@ void sort_faces(void); #include "BIF_editconstraint.h" #include "BDR_editobject.h" +#include "BDR_editface.h" #include "mydevice.h" #include "blendef.h" @@ -350,8 +351,15 @@ void join_mesh(void) } if(tfacemain) { - if(me->tface) memcpy(tface, me->tface, me->totface*sizeof(TFace)); - tface+= me->totface; + if(me->tface) { + memcpy(tface, me->tface, me->totface*sizeof(TFace)); + tface+= me->totface; + } + else { + for(a=0; atotface; a++, tface++) { + default_tface(tface); + } + } } }