Skip to content

Commit

Permalink
Merge pull request #71 from Heath123/patch-3
Browse files Browse the repository at this point in the history
Fix #69
  • Loading branch information
Robert-N7 authored Aug 11, 2021
2 parents d59c4dd + 3ef2200 commit 5dd9b98
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion abmatt/converters/colors.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def combine(self, color, combine_geometry=False):
if combine_geometry: # Make this apart of the tris
if self.combined_index.stop != len(self.face_indices):
raise RuntimeError('Cannot combine color geometry in previously combined color!')
if (self.rgba_colors != color.rgba_colors).all():
if not np.array_equal(self.rgba_colors, color.rgba_colors):
color.face_indices += len(self)
self.rgba_colors = np.append(self.rgba_colors, color.rgba_colors, 0)
color.combined_index = slice(len(self.face_indices), len(self.face_indices) + len(color.face_indices))
Expand Down

0 comments on commit 5dd9b98

Please sign in to comment.