Fix regression (since 6f8b379) causing crash in flattening edge case

rdb · rdb · commit 4fae81947e67 · 2017-08-07T23:00:28.000+02:00
diff --git 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));

Original file line number	Diff line number	Diff line change
`@@ -683,6 +683,7 @@ unify_in_place(int max_indices, bool preserve_order) {`
`683`	`683`	`int num_vertices = copy_primitives * total_vertices_per_primitive;`
`684`	`684`	`nassertv(num_vertices > 0);`
`685`	`685`	`{`
	`686`	`+ smaller->set_index_type(reader.get_index_type());`
`686`	`687`	`GeomVertexArrayDataHandle writer(smaller->modify_vertices(), current_thread);`
`687`	`688`	`writer.unclean_set_num_rows(num_vertices);`
`688`	`689`	`memcpy(writer.get_write_pointer(), ptr, stride * (size_t)(num_vertices - num_unused_vertices_per_primitive));`