[Bf-blender-cvs] [0210c6b9de3] master: Fix T51890: Turning off viewport display for array modifier is blocking dupliface in final render

[Bastien Montagne]

Commit: 0210c6b9de38283c90be3811d6a5d4c7d976c742
Author: Bastien Montagne
Date:   Thu Jun 29 15:44:00 2017 +0200
Branches: master
https://developer.blender.org/rB0210c6b9de38283c90be3811d6a5d4c7d976c742

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.

===================================================================

M       source/blender/blenkernel/intern/object_dupli.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object_dupli.c 
b/source/blender/blenkernel/intern/object_dupli.c
index e9ebd397df0..076bef71875 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs