Merge pull request #2065 from KhronosGroup/fix_2063_vc_without_material

Fix #2063 export VC without material

Author: julienduroure

addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_primitives_extract.py

@@ -456,13 +456,15 @@ def manage_material_info(self):
                     vc_color_name = material_info['vc_info']['color']
                 elif material_info['vc_info']['color_type'] == "active":
                     # Get active (render) Vertex Color
-                    vc_color_name = self.blender_mesh.color_attributes[self.blender_mesh.color_attributes.render_color_index].name
+                    if self.blender_mesh.color_attributes.render_color_index != -1:
+                        vc_color_name = self.blender_mesh.color_attributes[self.blender_mesh.color_attributes.render_color_index].name
 
                 if material_info['vc_info']['alpha_type'] == "name":
                     vc_alpha_name = material_info['vc_info']['alpha']
                 elif material_info['vc_info']['alpha_type'] == "active":
                     # Get active (render) Vertex Color
-                    vc_alpha_name = self.blender_mesh.color_attributes[self.blender_mesh.color_attributes.render_color_index].name
+                    if self.blender_mesh.color_attributes.render_color_index != -1:
+                        vc_alpha_name = self.blender_mesh.color_attributes[self.blender_mesh.color_attributes.render_color_index].name
 
                 if vc_color_name is not None:
 
@@ -482,7 +484,7 @@ def manage_material_info(self):
                         # We need to check if we need to add alpha
                         add_alpha = vc_alpha_name is not None
                         mat = get_material_from_idx(material_idx, self.materials, self.export_settings)
-                        add_alpha = add_alpha and not (mat.blend_method is None or mat.blend_method == 'OPAQUE')
+                        add_alpha = mat is not None and add_alpha and not (mat.blend_method is None or mat.blend_method == 'OPAQUE')
                         # Manage Vertex Color (RGB and Alpha if needed)
                         self.__manage_color_attribute(vc_color_name, vc_alpha_name if add_alpha else None)
                     else:
@@ -960,6 +962,33 @@ def __manage_color_attribute(self, attr_name, attr_name_alpha):
             # Must calculate the type of the field : FLOAT_COLOR or BYTE_COLOR
             additional_fields.append(('COLOR_0' + str(i), gltf2_blender_conversion.get_numpy_type('FLOAT_COLOR' if max_index == 3 else 'BYTE_COLOR')))
 
+
+        if self.export_settings['gltf_loose_edges']:
+            additional_fields_edges = []
+            for i in range(max_index):
+                # Must calculate the type of the field : FLOAT_COLOR or BYTE_COLOR
+                additional_fields_edges.append(('COLOR_0' + str(i), gltf2_blender_conversion.get_numpy_type('FLOAT_COLOR' if max_index == 3 else 'BYTE_COLOR')))
+
+            new_dt = np.dtype(self.dots_edges.dtype.descr + additional_fields_edges)
+            dots_edges = np.zeros(self.dots_edges.shape, dtype=new_dt)
+            for f in self.dots_edges.dtype.names:
+                dots_edges[f] = self.dots_edges[f]
+
+            self.dots_edges = dots_edges
+
+        if self.export_settings['gltf_loose_points']:
+            additional_fields_points = []
+            for i in range(max_index):
+                # Must calculate the type of the field : FLOAT_COLOR or BYTE_COLOR
+                additional_fields_points.append(('COLOR_0' + str(i), gltf2_blender_conversion.get_numpy_type('FLOAT_COLOR' if max_index == 3 else 'BYTE_COLOR')))
+
+            new_dt = np.dtype(self.dots_points.dtype.descr + additional_fields_points)
+            dots_points = np.zeros(self.dots_points.shape, dtype=new_dt)
+            for f in self.dots_points.dtype.names:
+                dots_points[f] = self.dots_points[f]
+
+            self.dots_points = dots_points
+
         # Keep the existing custom attribute
         # Data will be exported twice, one for COLOR_O, one for the custom attribute
         new_dt = np.dtype(self.dots.dtype.descr + additional_fields)
@@ -974,7 +1003,7 @@ def __manage_color_attribute(self, attr_name, attr_name_alpha):
             self.dots['COLOR_0' +str(i)] = data_dots[:, i]
             if self.export_settings['gltf_loose_edges'] and attr.domain == "POINT":
                 self.dots_edges['COLOR_0' + str(i)] = data_dots_edges[:, i]
-            if self.export_settings['gltf_loose_points'] and attr['blender_domain'] == "POINT":
+            if self.export_settings['gltf_loose_points'] and attr.domain == "POINT":
                 self.dots_points['COLOR_0' + str(i)] = data_dots_points[:, i]
 
         # Add COLOR_0 in attribute list

addons/io_scene_gltf2/blender/exp/material/gltf2_blender_gather_materials.py

@@ -555,6 +555,12 @@ def get_base_material(material_idx, materials, export_settings):
             mat,
             export_settings
         )
+
+    if material is None:
+        # If no material, the mesh can still have vertex color
+        # So, retrieving it
+        material_info["vc_info"] = {"color_type": "active", "alpha_type": "active"}
+
     return material, material_info
 
 def get_all_textures(idx=0):