From 4fae81947e67e903fdc587589de7f47bffa484bd Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 7 Aug 2017 22:58:30 +0200
Subject: [PATCH] Fix regression (since 6f8b379) causing crash in flattening
 edge case

---
 panda/src/gobj/geom.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/panda/src/gobj/geom.cxx b/panda/src/gobj/geom.cxx
index cf9a3a49b1..6019a4c577 100644
--- a/panda/src/gobj/geom.cxx
+++ b/panda/src/gobj/geom.cxx
@@ -683,6 +683,7 @@ unify_in_place(int max_indices, bool preserve_order) {
           int num_vertices = copy_primitives * total_vertices_per_primitive;
           nassertv(num_vertices > 0);
           {
+            smaller->set_index_type(reader.get_index_type());
             GeomVertexArrayDataHandle writer(smaller->modify_vertices(), current_thread);
             writer.unclean_set_num_rows(num_vertices);
             memcpy(writer.get_write_pointer(), ptr, stride * (size_t)(num_vertices - num_unused_vertices_per_primitive));