archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for bug #72.

Browse Source 
Update mesh normals after a boolean operation.
Also updated boolen operation to copy face flag (propagate
face smoothness information).
This commit is contained in:
Daniel Dunbar
2003-03-24 16:08:15 +00:00
parent b224f90da7
commit f7cc1873b7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_booleanops.h
View File

@@ -132,7 +132,7 @@ typedef struct {
/* assorted tface flags */ /* assorted tface flags */
void *tpage; void *tpage;
char flag, transp; char flag, transp, faceflag;
short mode, tile; short mode, tile;
} FaceData; } FaceData;

11
source/blender/src/booleanops.c
View File

@@ -244,6 +244,7 @@ FaceIt_Fill(
} }
} }
fdata->faceflag = mface->flag;
fdata->material = give_current_material(ob, mface->mat_nr+1); fdata->material = give_current_material(ob, mface->mat_nr+1);
// pack rgba colors. // pack rgba colors.
@@ -605,8 +606,6 @@ AddNewBlenderMesh(
return ob_new; return ob_new;
}; };
/** /**
* *
* External interface * External interface
@@ -702,6 +701,7 @@ ConvertCSGDescriptorsToMeshObject(
FaceData *fdata; FaceData *fdata;
face_it->Fill(face_it->it,&face); face_it->Fill(face_it->it,&face);
fdata = face.user_face_data;
// cheat CSG never dumps out quads. // cheat CSG never dumps out quads.
@@ -713,13 +713,12 @@ ConvertCSGDescriptorsToMeshObject(
mface->edcode = ME_V1V2|ME_V2V3|ME_V3V4|ME_V4V1; mface->edcode = ME_V1V2|ME_V2V3|ME_V3V4|ME_V4V1;
mface->puno = 0; mface->puno = 0;
mface->mat_nr = 0; mface->mat_nr = 0;
mface->flag = 0; mface->flag = fdata->faceflag;
/* HACK, perform material to index mapping using a general /* HACK, perform material to index mapping using a general
* hash table, just tuck the int into a void *. * hash table, just tuck the int into a void *.
*/ */
fdata = face.user_face_data;
if (!BLI_ghash_haskey(material_hash, fdata->material)) { if (!BLI_ghash_haskey(material_hash, fdata->material)) {
int matnr = nmaterials++; int matnr = nmaterials++;
BLI_ghash_insert(material_hash, fdata->material, (void*) matnr); BLI_ghash_insert(material_hash, fdata->material, (void*) matnr);
@@ -765,8 +764,10 @@ ConvertCSGDescriptorsToMeshObject(
BLI_ghash_free(material_hash, NULL, NULL); BLI_ghash_free(material_hash, NULL, NULL);
me->totface = face_it->num_elements; me->totface = face_it->num_elements;
// thats it!
mesh_calculate_vertex_normals(me);
// thats it!
if (user_face_vertex_data) { if (user_face_vertex_data) {
MEM_freeN(user_face_vertex_data); MEM_freeN(user_face_vertex_data);
} }