[Bf-blender-cvs] [3c09e4d8ccc] master: Fix T69993: vertex instancing only works on original vertices

Brecht Van Lommel noreply at git.blender.org
Thu Sep 19 15:27:10 CEST 2019


Commit: 3c09e4d8ccc805fde07565bab620e7295e8ba2ac
Author: Brecht Van Lommel
Date:   Thu Sep 19 15:22:36 2019 +0200
Branches: master
https://developer.blender.org/rB3c09e4d8ccc805fde07565bab620e7295e8ba2ac

Fix T69993: vertex instancing only works on original vertices

This behavior was accidentally changed in 3e6f37b9, now it works compatible
with 2.79 again.

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

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 b9c4adafab2..6b6c68b197e 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -401,12 +401,8 @@ static void make_child_duplis_verts(const DupliContext *ctx, void *userdata, Obj
   mul_m4_m4m4(vdd->child_imat, child->imat, ctx->object->obmat);
 
   const MVert *mvert = me_eval->mvert;
-  const int *origindex = CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX);
-
-  for (int i = 0, j = 0; i < me_eval->totvert; i++) {
-    if (origindex == NULL || origindex[i] != ORIGINDEX_NONE) {
-      vertex_dupli(vdd, j++, mvert[i].co, mvert[i].no);
-    }
+  for (int i = 0; i < me_eval->totvert; i++) {
+    vertex_dupli(vdd, i, mvert[i].co, mvert[i].no);
   }
 }



More information about the Bf-blender-cvs mailing list