blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T40315: Boolean modifier with Freestyle edges. 

The helper function `make_freestyle_edge_mark_hash()` was referring to the
original mesh to determine Freestyle edge marks for individual derived mesh edges.
This is no longer necessary now that derived meshes deliver CD_FREESTYLE_EDGE
and CD_FREESTYLE_FACE layers of their own.  The reference of the original mesh
was also inappropriate since the edges coming from one of the operands of a boolean
modifier don't have proper CD_ORIGINDEX values but ORIGINDEX_NONE's.

Many thanks to Sergey Sharybin for patch contributions and discussions.
This commit is contained in:
Tamito Kajiyama 2014-05-29 17:24:25 +09:00
parent c641baa047
commit edfd989e86
Notes: blender-bot 2023-02-14 10:36:32 +01:00 
Referenced by issue #40457, Subsurf modifier with Freestyle edges
Referenced by issue #40456, Branched Path Tracer + SSS incorrect Result
Referenced by issue #40315, Boolean modifier with Freestyle edges
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2907,6 +2907,12 @@ void BKE_object_handle_update_ex(EvaluationContext *eval_ctx,
{
BMEditMesh *em = (ob == scene->obedit) ? BKE_editmesh_from_object(ob) : NULL;
uint64_t data_mask = scene->customdata_mask | CD_MASK_BAREMESH;
#ifdef WITH_FREESTYLE
/* make sure Freestyle edge/face marks appear in DM for render (see T40315) */
if (eval_ctx->for_render) {
data_mask |= CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE;
}
#endif
if (em) {
makeDerivedMesh(scene, ob, em, data_mask, 0); /* was CD_MASK_BAREMESH */
}

27
source/blender/render/intern/source/convertblender.c
View File

@ -3063,36 +3063,21 @@ static void add_volume(Render *re, ObjectRen *obr, Material *ma)
}
#ifdef WITH_FREESTYLE
static EdgeHash *make_freestyle_edge_mark_hash(Mesh *me, DerivedMesh *dm)
static EdgeHash *make_freestyle_edge_mark_hash(DerivedMesh *dm)
{
EdgeHash *edge_hash= NULL;
FreestyleEdge *fed;
MEdge *medge;
int totedge, a;
const int *index;
medge = dm->getEdgeArray(dm);
totedge = dm->getNumEdges(dm);
index = dm->getEdgeDataArray(dm, CD_ORIGINDEX);
fed = CustomData_get_layer(&me->edata, CD_FREESTYLE_EDGE);
fed = dm->getEdgeDataArray(dm, CD_FREESTYLE_EDGE);
if (fed) {
edge_hash = BLI_edgehash_new(__func__);
if (!index) {
if (me->totedge == totedge) {
for (a = 0; a < me->totedge; a++) {
if (fed[a].flag & FREESTYLE_EDGE_MARK) {
BLI_edgehash_insert(edge_hash, medge[a].v1, medge[a].v2, medge + a);
}
}
}
}
else {
for (a = 0; a < totedge; a++) {
if (index[a] == ORIGINDEX_NONE)
continue;
if (fed[index[a]].flag & FREESTYLE_EDGE_MARK)
BLI_edgehash_insert(edge_hash, medge[a].v1, medge[a].v2, medge+a);
}
for (a = 0; a < totedge; a++) {
if (fed[a].flag & FREESTYLE_EDGE_MARK)
BLI_edgehash_insert(edge_hash, medge[a].v1, medge[a].v2, medge+a);
}
}
return edge_hash;
@ -3272,7 +3257,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
EdgeHash *edge_hash;
/* create a hash table of Freestyle edge marks */
edge_hash = make_freestyle_edge_mark_hash(me, dm);
edge_hash = make_freestyle_edge_mark_hash(dm);
#endif
/* store customdata names, because DerivedMesh is freed */