blender
/
blender
134
399
Fork 581
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix T51890: Turning off viewport display for array modifier is blocking dupliface in final render 

DupliVert/Face were not using render DM at render time.
This commit is contained in:
Bastien Montagne 2017-06-29 15:44:00 +02:00
parent a57a7975a1
commit 0210c6b9de
Notes: blender-bot 2023-02-14 06:51:07 +01:00 
Referenced by issue #51890, Turning off viewport display for array modifier is blocking dupliface in final render
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/object_dupli.c
View File

@ -547,10 +547,15 @@ static void make_duplis_verts(const DupliContext *ctx)
BMEditMesh *em = BKE_editmesh_from_object(parent);
CustomDataMask dm_mask = (use_texcoords ? CD_MASK_BAREMESH | CD_MASK_ORCO : CD_MASK_BAREMESH);
if (em)
if (ctx->eval_ctx->mode == DAG_EVAL_RENDER) {
vdd.dm = mesh_create_derived_render(scene, parent, dm_mask);
}
else if (em) {
vdd.dm = editbmesh_get_derived_cage(scene, parent, em, dm_mask);
else
}
else {
vdd.dm = mesh_get_derived_final(scene, parent, dm_mask);
}
vdd.edit_btmesh = me->edit_btmesh;
if (use_texcoords)
@ -810,10 +815,15 @@ static void make_duplis_faces(const DupliContext *ctx)
BMEditMesh *em = BKE_editmesh_from_object(parent);
CustomDataMask dm_mask = (use_texcoords ? CD_MASK_BAREMESH | CD_MASK_ORCO | CD_MASK_MLOOPUV : CD_MASK_BAREMESH);
if (em)
if (ctx->eval_ctx->mode == DAG_EVAL_RENDER) {
fdd.dm = mesh_create_derived_render(scene, parent, dm_mask);
}
else if (em) {
fdd.dm = editbmesh_get_derived_cage(scene, parent, em, dm_mask);
else
}
else {
fdd.dm = mesh_get_derived_final(scene, parent, dm_mask);
}
if (use_texcoords) {
CustomData *ml_data = fdd.dm->getLoopDataLayout(fdd.dm);